Changes in directory llvm/lib/ExecutionEngine/JIT:
JIT.cpp updated: 1.94 -> 1.95
JIT.h updated: 1.31 -> 1.32
---
Log message:
rename JIT::state -> JIT::jitstate to avoid shadowing ExecutionEngine::state
---
Diffs of the changes: (+8 -8)
JIT.cpp | 14 +++++++-------
JIT.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.94
llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.95
--- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.94 Mon Mar 5 21:11:31 2007
+++ llvm/lib/ExecutionEngine/JIT/JIT.cpp Fri Apr 20 17:40:05 2007
@@ -50,7 +50,7 @@
}
JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji)
- : ExecutionEngine(MP), TM(tm), TJI(tji), state(MP) {
+ : ExecutionEngine(MP), TM(tm), TJI(tji), jitstate(MP) {
setTargetData(TM.getTargetData());
// Initialize MCE
@@ -58,7 +58,7 @@
// Add target data
MutexGuard locked(lock);
- FunctionPassManager &PM = state.getPM(locked);
+ FunctionPassManager &PM = jitstate.getPM(locked);
PM.add(new TargetData(*TM.getTargetData()));
// Turn the machine code intermediate representation into bytes in memory
that
@@ -235,15 +235,15 @@
// JIT the function
isAlreadyCodeGenerating = true;
- state.getPM(locked).run(*F);
+ jitstate.getPM(locked).run(*F);
isAlreadyCodeGenerating = false;
// If the function referred to a global variable that had not yet been
// emitted, it allocates memory for the global, but doesn't emit it yet.
Emit
// all of these globals now.
- while (!state.getPendingGlobals(locked).empty()) {
- const GlobalVariable *GV = state.getPendingGlobals(locked).back();
- state.getPendingGlobals(locked).pop_back();
+ while (!jitstate.getPendingGlobals(locked).empty()) {
+ const GlobalVariable *GV = jitstate.getPendingGlobals(locked).back();
+ jitstate.getPendingGlobals(locked).pop_back();
EmitGlobalVariable(GV);
}
}
@@ -335,7 +335,7 @@
unsigned MisAligned = ((intptr_t)Ptr & (A-1));
Ptr = (char*)Ptr + (MisAligned ? (A-MisAligned) : 0);
}
- state.getPendingGlobals(locked).push_back(GV);
+ jitstate.getPendingGlobals(locked).push_back(GV);
}
addGlobalMapping(GV, Ptr);
return Ptr;
Index: llvm/lib/ExecutionEngine/JIT/JIT.h
diff -u llvm/lib/ExecutionEngine/JIT/JIT.h:1.31
llvm/lib/ExecutionEngine/JIT/JIT.h:1.32
--- llvm/lib/ExecutionEngine/JIT/JIT.h:1.31 Sat Mar 3 12:19:18 2007
+++ llvm/lib/ExecutionEngine/JIT/JIT.h Fri Apr 20 17:40:05 2007
@@ -54,7 +54,7 @@
TargetJITInfo &TJI; // The JITInfo for the target we are compiling to
MachineCodeEmitter *MCE; // MCE object
- JITState state;
+ JITState jitstate;
JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji);
public:
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
