maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

rename JIT::state -> JIT::jitstate to avoid shadowing ExecutionEngine::state 

llvm-svn: 36286
This commit is contained in:
Chris Lattner 2007-04-20 22:40:05 +00:00
parent d9d3a4bbd6
commit 6a309848c1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/ExecutionEngine/JIT/JIT.cpp
View File

@ -50,7 +50,7 @@ namespace llvm {
}
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 @@ JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji)
// 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 @@ void JIT::runJITOnFunction(Function *F) {
// 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 @@ void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
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;

2
llvm/lib/ExecutionEngine/JIT/JIT.h
View File

@ -54,7 +54,7 @@ class JIT : public ExecutionEngine {
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: