[llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp

[Evan Cheng]

Changes in directory llvm/lib/ExecutionEngine/JIT:

JITEmitter.cpp updated: 1.109 -> 1.110
---
Log message:

Resolve BB references with relocation.

---
Diffs of the changes:  (+2 -5)

 JITEmitter.cpp |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


Index: llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.109 llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.110
--- llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.109	Thu Jul 27 08:40:34 2006
+++ llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp	Thu Jul 27 13:19:24 2006
@@ -807,13 +807,13 @@
         ResultPtr = getPointerToGlobal(MR.getGlobalValue(),
                                        BufferBegin+MR.getMachineCodeOffset(),
                                        MR.doesntNeedFunctionStub());
+      } else if (MR.isBasicBlock()) {
+        ResultPtr = (void*)getMachineBasicBlockAddress(MR.getBasicBlock());
       } else if (MR.isConstantPoolIndex()){
-        assert(MR.isConstantPoolIndex());
         ResultPtr=(void*)getConstantPoolEntryAddress(MR.getConstantPoolIndex());
       } else {
         assert(MR.isJumpTableIndex());
         ResultPtr=(void*)getJumpTableEntryAddress(MR.getJumpTableIndex());
-
       }
 
       MR.setResultPointer(ResultPtr);
@@ -846,9 +846,6 @@
     }
   }
 
-  // Resolve BasicaBlock references.
-  TheJIT->getJITInfo().resolveBBRefs(*this);
-
   // Invalidate the icache if necessary.
   synchronizeICache(FnStart, FnEnd-FnStart);