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

[Reid Spencer]

Changes in directory llvm/lib/ExecutionEngine/JIT:

JIT.cpp updated: 1.90 -> 1.91
JITEmitter.cpp updated: 1.128 -> 1.129
---
Log message:

For PR1136: http://llvm.org/PR1136 : Rename GlobalVariable::isExternal as isDeclaration to avoid
confusion with external linkage types.


---
Diffs of the changes:  (+4 -4)

 JIT.cpp        |    4 ++--
 JITEmitter.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.90 llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.91
--- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.90	Sat Jan 20 16:35:55 2007
+++ llvm/lib/ExecutionEngine/JIT/JIT.cpp	Tue Jan 30 14:08:37 2007
@@ -291,7 +291,7 @@
     }
   }
 
-  if (F->isExternal()) {
+  if (F->isDeclaration()) {
     void *Addr = getPointerToNamedFunction(F->getName());
     addGlobalMapping(F, Addr);
     return Addr;
@@ -314,7 +314,7 @@
   if (Ptr) return Ptr;
 
   // If the global is external, just remember the address.
-  if (GV->isExternal()) {
+  if (GV->isDeclaration()) {
 #if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_4) && \
     ((MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4) || \
      (MAC_OS_X_VERSION_MIN_REQUIRED == MAC_OS_X_VERSION_10_4 && \


Index: llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.128 llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.129
--- llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp:1.128	Tue Jan 23 04:26:08 2007
+++ llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp	Tue Jan 30 14:08:37 2007
@@ -543,7 +543,7 @@
   // Call the lazy resolver function unless we already KNOW it is an external
   // function, in which case we just skip the lazy resolution step.
   void *Actual = (void*)(intptr_t)LazyResolverFn;
-  if (F->isExternal() && !F->hasNotBeenReadFromBytecode())
+  if (F->isDeclaration() && !F->hasNotBeenReadFromBytecode())
     Actual = TheJIT->getPointerToFunction(F);
 
   // Otherwise, codegen a new stub.  For now, the stub will call the lazy
@@ -746,7 +746,7 @@
   void *ResultPtr = TheJIT->getPointerToGlobalIfAvailable(F);
   if (ResultPtr) return ResultPtr;
 
-  if (F->isExternal() && !F->hasNotBeenReadFromBytecode()) {
+  if (F->isDeclaration() && !F->hasNotBeenReadFromBytecode()) {
     // If this is an external function pointer, we can force the JIT to
     // 'compile' it, which really just adds it to the map.
     if (DoesntNeedStub)