Skip to content

Commit 1b66fdc

Browse files
Delete the CalendarData workaround (#2403)
1 parent 261ca7f commit 1b66fdc

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

src/coreclr/jit/llvm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ class Llvm
428428
private:
429429
const unsigned ROOT_FUNC_IDX = 0;
430430

431-
bool initializeFunctions();
431+
void initializeFunctions();
432432
void generateProlog();
433433
void initializeShadowStack();
434434
void initializeLocals();

src/coreclr/jit/llvmcodegen.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
//
1515
void Llvm::Compile()
1616
{
17-
if (initializeFunctions())
18-
{
19-
return;
20-
}
21-
17+
initializeFunctions();
2218
initializeDebugInfo();
2319

2420
JITDUMPEXEC(_compiler->fgDispBasicBlocks());
@@ -41,7 +37,7 @@ void Llvm::Compile()
4137
verifyGeneratedCode();
4238
}
4339

44-
bool Llvm::initializeFunctions()
40+
void Llvm::initializeFunctions()
4541
{
4642
const char* mangledName = GetMangledMethodName(m_info->compMethodHnd);
4743
Function* rootLlvmFunction = getOrCreateKnownLlvmFunction(mangledName, [=]() { return createFunctionType(); });
@@ -60,15 +56,6 @@ bool Llvm::initializeFunctions()
6056
rootLlvmFunction->addFnAttr(llvm::Attribute::NoInline);
6157
}
6258

63-
// TODO-LLVM: investigate.
64-
if (!strcmp(mangledName, "S_P_CoreLib_System_Globalization_CalendarData__EnumCalendarInfo"))
65-
{
66-
llvm::BasicBlock* llvmBlock = llvm::BasicBlock::Create(m_context->Context, "", rootLlvmFunction);
67-
_builder.SetInsertPoint(llvmBlock);
68-
_builder.CreateRet(_builder.getInt8(0));
69-
return true;
70-
}
71-
7259
// First function is always the root.
7360
m_functions = std::vector<FunctionInfo>(_compiler->compFuncCount());
7461
m_functions[ROOT_FUNC_IDX] = {rootLlvmFunction};
@@ -182,8 +169,6 @@ bool Llvm::initializeFunctions()
182169

183170
m_EHUnwindLlvmBlocks[ehIndex] = dispatchLlvmBlock;
184171
}
185-
186-
return false;
187172
}
188173

189174
void Llvm::generateProlog()

0 commit comments

Comments
 (0)