Skip to content

Commit

Permalink
Post-JIT light cleanup of ExecutionEngine.h: edited comments about th…
Browse files Browse the repository at this point in the history
…e JIT,

removed runJITOnFunction and isLazyCompilationDisabled.

Deleted CodeGen\MachineCodeInfo.h which was used by runJITOnFunction() only.




git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217193 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
yrnkrn committed Sep 4, 2014
1 parent a49caa5 commit edee9e8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 77 deletions.
53 changes: 0 additions & 53 deletions include/llvm/CodeGen/MachineCodeInfo.h

This file was deleted.

34 changes: 10 additions & 24 deletions include/llvm/ExecutionEngine/ExecutionEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,8 @@ class ExecutionEngine {
void *(*LazyFunctionCreator)(const std::string &);

public:
/// lock - This lock protects the ExecutionEngine, MCJIT, JIT, JITResolver and
/// JITEmitter classes. It must be held while changing the internal state of
/// any of those classes.
/// lock - This lock protects the ExecutionEngine and MCJIT classes. It must
/// be held while changing the internal state of any of those classes.
sys::Mutex lock;

//===--------------------------------------------------------------------===//
Expand Down Expand Up @@ -216,10 +215,6 @@ class ExecutionEngine {
/// it prints a message to stderr and aborts.
///
/// This function is deprecated for the MCJIT execution engine.
///
/// FIXME: the JIT and MCJIT interfaces should be disentangled or united
/// again, if possible.
///
virtual void *getPointerToNamedFunction(const std::string &Name,
bool AbortOnFailure = true) = 0;

Expand All @@ -232,7 +227,7 @@ class ExecutionEngine {
"EE!");
}

/// generateCodeForModule - Run code generationen for the specified module and
/// generateCodeForModule - Run code generation for the specified module and
/// load it into memory.
///
/// When this function has completed, all code and data for the specified
Expand All @@ -246,7 +241,7 @@ class ExecutionEngine {
/// locally can use the getFunctionAddress call, which will generate code
/// and apply final preparations all in one step.
///
/// This method has no effect for the legacy JIT engine or the interpeter.
/// This method has no effect for the interpeter.
virtual void generateCodeForModule(Module *M) {}

/// finalizeObject - ensure the module is fully processed and is usable.
Expand All @@ -255,8 +250,7 @@ class ExecutionEngine {
/// object usable for execution. It should be called after sections within an
/// object have been relocated using mapSectionAddress. When this method is
/// called the MCJIT execution engine will reapply relocations for a loaded
/// object. This method has no effect for the legacy JIT engine or the
/// interpeter.
/// object. This method has no effect for the interpeter.
virtual void finalizeObject() {}

/// runStaticConstructorsDestructors - This method is used to execute all of
Expand Down Expand Up @@ -341,24 +335,21 @@ class ExecutionEngine {
/// getGlobalValueAddress - Return the address of the specified global
/// value. This may involve code generation.
///
/// This function should not be called with the JIT or interpreter engines.
/// This function should not be called with the interpreter engine.
virtual uint64_t getGlobalValueAddress(const std::string &Name) {
// Default implementation for JIT and interpreter. MCJIT will override this.
// Default implementation for the interpreter. MCJIT will override this.
// JIT and interpreter clients should use getPointerToGlobal instead.
return 0;
}

/// getFunctionAddress - Return the address of the specified function.
/// This may involve code generation.
virtual uint64_t getFunctionAddress(const std::string &Name) {
// Default implementation for JIT and interpreter. MCJIT will override this.
// JIT and interpreter clients should use getPointerToFunction instead.
// Default implementation for the interpreter. MCJIT will override this.
// Interpreter clients should use getPointerToFunction instead.
return 0;
}

// The JIT overrides a version that actually does this.
virtual void runJITOnFunction(Function *, MachineCodeInfo * = nullptr) { }

/// getGlobalValueAtAddress - Return the LLVM global value object that starts
/// at the specified address.
///
Expand Down Expand Up @@ -391,7 +382,7 @@ class ExecutionEngine {
virtual void UnregisterJITEventListener(JITEventListener *) {}

/// Sets the pre-compiled object cache. The ownership of the ObjectCache is
/// not changed. Supported by MCJIT but not JIT.
/// not changed. Supported by MCJIT but not the interpreter.
virtual void setObjectCache(ObjectCache *) {
llvm_unreachable("No support for an object cache");
}
Expand Down Expand Up @@ -433,11 +424,6 @@ class ExecutionEngine {
bool isCompilingLazily() const {
return CompilingLazily;
}
// Deprecated in favor of isCompilingLazily (to reduce double-negatives).
// Remove this in LLVM 2.8.
bool isLazyCompilationDisabled() const {
return !CompilingLazily;
}

/// DisableGVCompilation - If called, the JIT will abort if it's asked to
/// allocate space and populate a GlobalVariable that is not internal to
Expand Down

0 comments on commit edee9e8

Please sign in to comment.