Permalink
Browse files

MCJIT: [cygming] Give noop to __main also in RecordingMemoryManger. I…

…t is emitted in @main().

XFAIL(s) can be removed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168282 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information...
1 parent 6d80320 commit a1c79d0dc971b1b2e969b9a5e58c3733f2d8c15b @chapuni chapuni committed Nov 18, 2012
View
2 test/ExecutionEngine/MCJIT/simpletest-remote.ll
@@ -1,5 +1,5 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit %s > /dev/null
-; XFAIL: arm, mingw32
+; XFAIL: arm
define i32 @bar() {
ret i32 0
View
2 test/ExecutionEngine/MCJIT/stubs-remote.ll
@@ -1,5 +1,5 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -disable-lazy-compilation=false %s
-; XFAIL: arm, mingw32
+; XFAIL: arm
define i32 @main() nounwind {
entry:
View
2 test/ExecutionEngine/MCJIT/test-common-symbols-remote.ll
@@ -1,5 +1,5 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -O0 -disable-lazy-compilation=false %s
-; XFAIL: arm, mingw32, cygwin
+; XFAIL: arm
; The intention of this test is to verify that symbols mapped to COMMON in ELF
; work as expected.
View
2 test/ExecutionEngine/MCJIT/test-data-align-remote.ll
@@ -1,5 +1,5 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -O0 %s
-; XFAIL: arm, mingw32
+; XFAIL: arm
; Check that a variable is always aligned as specified.
View
2 test/ExecutionEngine/MCJIT/test-fp-no-external-funcs-remote.ll
@@ -1,5 +1,5 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit %s > /dev/null
-; XFAIL: arm, mingw32
+; XFAIL: arm
define double @test(double* %DP, double %Arg) {
%D = load double* %DP ; <double> [#uses=1]
View
2 test/ExecutionEngine/MCJIT/test-global-init-nonzero-remote.ll
@@ -1,5 +1,5 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit %s > /dev/null
-; XFAIL: arm, mingw32, cygwin
+; XFAIL: arm
@count = global i32 1, align 4
View
2 test/ExecutionEngine/MCJIT/test-ptr-reloc-remote.ll
@@ -1,5 +1,5 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -O0 %s
-; XFAIL: arm, mingw32
+; XFAIL: arm
@.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
@ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4
View
13 tools/lli/RecordingMemoryManager.cpp
@@ -82,7 +82,20 @@ void RecordingMemoryManager::endExceptionTable(const Function *F, uint8_t *Table
void RecordingMemoryManager::deallocateExceptionTable(void *ET) {
llvm_unreachable("Unexpected!");
}
+
+static int jit_noop() {
+ return 0;
+}
+
void *RecordingMemoryManager::getPointerToNamedFunction(const std::string &Name,
bool AbortOnFailure) {
+ // We should not invoke parent's ctors/dtors from generated main()!
+ // On Mingw and Cygwin, the symbol __main is resolved to
+ // callee's(eg. tools/lli) one, to invoke wrong duplicated ctors
+ // (and register wrong callee's dtors with atexit(3)).
+ // We expect ExecutionEngine::runStaticConstructorsDestructors()
+ // is called before ExecutionEngine::runFunctionAsMain() is called.
+ if (Name == "__main") return (void*)(intptr_t)&jit_noop;
+
return NULL;
}

0 comments on commit a1c79d0

Please sign in to comment.