[llvm-commits] [llvm] r74678 - in /llvm/trunk: include/llvm-c/lto.h tools/lto/LTOCodeGenerator.cpp tools/lto/LTOCodeGenerator.h tools/lto/LTOModule.cpp tools/lto/LTOModule.h tools/lto/lto.cpp
Owen Anderson
resistor at mac.com
Wed Jul 1 17:31:14 PDT 2009
Author: resistor
Date: Wed Jul 1 19:31:14 2009
New Revision: 74678
URL: http://llvm.org/viewvc/llvm-project?rev=74678&view=rev
Log:
Maintain the old LTO API, by using the global context.
Modified:
llvm/trunk/include/llvm-c/lto.h
llvm/trunk/tools/lto/LTOCodeGenerator.cpp
llvm/trunk/tools/lto/LTOCodeGenerator.h
llvm/trunk/tools/lto/LTOModule.cpp
llvm/trunk/tools/lto/LTOModule.h
llvm/trunk/tools/lto/lto.cpp
Modified: llvm/trunk/include/llvm-c/lto.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/lto.h?rev=74678&r1=74677&r2=74678&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/lto.h (original)
+++ llvm/trunk/include/llvm-c/lto.h Wed Jul 1 19:31:14 2009
@@ -59,8 +59,6 @@
/** opaque reference to a code generator */
typedef struct LTOCodeGenerator* lto_code_gen_t;
-typedef struct LTOContext* lto_context_t;
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -113,7 +111,7 @@
* Returns NULL on error (check lto_get_error_message() for details).
*/
extern lto_module_t
-lto_module_create(const char* path, LLVMContextRef Ctxt);
+lto_module_create(const char* path);
/**
@@ -121,8 +119,7 @@
* Returns NULL on error (check lto_get_error_message() for details).
*/
extern lto_module_t
-lto_module_create_from_memory(const void* mem, size_t length,
- LLVMContextRef Ctxt);
+lto_module_create_from_memory(const void* mem, size_t length);
/**
@@ -166,7 +163,7 @@
* Returns NULL on error (check lto_get_error_message() for details).
*/
extern lto_code_gen_t
-lto_codegen_create(LLVMContextRef Ctxt);
+lto_codegen_create(void);
/**
Modified: llvm/trunk/tools/lto/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.cpp?rev=74678&r1=74677&r2=74678&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOCodeGenerator.cpp (original)
+++ llvm/trunk/tools/lto/LTOCodeGenerator.cpp Wed Jul 1 19:31:14 2009
@@ -19,6 +19,7 @@
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Linker.h"
+#include "llvm/LLVMContext.h"
#include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
#include "llvm/PassManager.h"
@@ -69,8 +70,8 @@
}
-LTOCodeGenerator::LTOCodeGenerator(LLVMContext& Context)
- : _context(Context),
+LTOCodeGenerator::LTOCodeGenerator()
+ : _context(getGlobalContext()),
_linker("LinkTimeOptimizer", "ld-temp.o", _context), _target(NULL),
_emitDwarfDebugInfo(false), _scopeRestrictionsDone(false),
_codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC),
Modified: llvm/trunk/tools/lto/LTOCodeGenerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.h?rev=74678&r1=74677&r2=74678&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOCodeGenerator.h (original)
+++ llvm/trunk/tools/lto/LTOCodeGenerator.h Wed Jul 1 19:31:14 2009
@@ -31,7 +31,7 @@
public:
static const char* getVersionString();
- LTOCodeGenerator(llvm::LLVMContext& Context);
+ LTOCodeGenerator();
~LTOCodeGenerator();
bool addModule(class LTOModule*, std::string& errMsg);
Modified: llvm/trunk/tools/lto/LTOModule.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOModule.cpp?rev=74678&r1=74677&r2=74678&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOModule.cpp (original)
+++ llvm/trunk/tools/lto/LTOModule.cpp Wed Jul 1 19:31:14 2009
@@ -69,7 +69,7 @@
bool LTOModule::isTargetMatch(MemoryBuffer* buffer, const char* triplePrefix)
{
OwningPtr<ModuleProvider> mp(getBitcodeModuleProvider(buffer,
- *new LLVMContext()));
+ getGlobalContext()));
// on success, mp owns buffer and both are deleted at end of this method
if ( !mp ) {
delete buffer;
@@ -87,13 +87,12 @@
}
LTOModule* LTOModule::makeLTOModule(const char* path,
- LLVMContext& Context,
std::string& errMsg)
{
OwningPtr<MemoryBuffer> buffer(MemoryBuffer::getFile(path, &errMsg));
if ( !buffer )
return NULL;
- return makeLTOModule(buffer.get(), Context, errMsg);
+ return makeLTOModule(buffer.get(), errMsg);
}
/// makeBuffer - create a MemoryBuffer from a memory range.
@@ -113,13 +112,12 @@
LTOModule* LTOModule::makeLTOModule(const void* mem, size_t length,
- LLVMContext& Context,
std::string& errMsg)
{
OwningPtr<MemoryBuffer> buffer(makeBuffer(mem, length));
if ( !buffer )
return NULL;
- return makeLTOModule(buffer.get(), Context, errMsg);
+ return makeLTOModule(buffer.get(), errMsg);
}
/// getFeatureString - Return a string listing the features associated with the
@@ -142,11 +140,10 @@
}
LTOModule* LTOModule::makeLTOModule(MemoryBuffer* buffer,
- LLVMContext& Context,
std::string& errMsg)
{
// parse bitcode buffer
- OwningPtr<Module> m(ParseBitcodeFile(buffer, Context, &errMsg));
+ OwningPtr<Module> m(ParseBitcodeFile(buffer, getGlobalContext(), &errMsg));
if ( !m )
return NULL;
// find machine architecture for this module
Modified: llvm/trunk/tools/lto/LTOModule.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOModule.h?rev=74678&r1=74677&r2=74678&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOModule.h (original)
+++ llvm/trunk/tools/lto/LTOModule.h Wed Jul 1 19:31:14 2009
@@ -32,7 +32,6 @@
class GlobalValue;
class Value;
class Function;
- class LLVMContext;
}
@@ -52,10 +51,8 @@
const char* triplePrefix);
static LTOModule* makeLTOModule(const char* path,
- llvm::LLVMContext& Context,
std::string& errMsg);
static LTOModule* makeLTOModule(const void* mem, size_t length,
- llvm::LLVMContext& Context,
std::string& errMsg);
const char* getTargetTriple();
@@ -91,7 +88,6 @@
const char* triplePrefix);
static LTOModule* makeLTOModule(llvm::MemoryBuffer* buffer,
- llvm::LLVMContext& Context,
std::string& errMsg);
static llvm::MemoryBuffer* makeBuffer(const void* mem, size_t length);
Modified: llvm/trunk/tools/lto/lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/lto.cpp?rev=74678&r1=74677&r2=74678&view=diff
==============================================================================
--- llvm/trunk/tools/lto/lto.cpp (original)
+++ llvm/trunk/tools/lto/lto.cpp Wed Jul 1 19:31:14 2009
@@ -86,10 +86,9 @@
// loads an object file from disk
// returns NULL on error (check lto_get_error_message() for details)
//
-lto_module_t lto_module_create(const char* path, LLVMContextRef Ctxt)
+lto_module_t lto_module_create(const char* path)
{
- return LTOModule::makeLTOModule(path, *llvm::unwrap(Ctxt),
- sLastErrorString);
+ return LTOModule::makeLTOModule(path, sLastErrorString);
}
@@ -97,11 +96,9 @@
// loads an object file from memory
// returns NULL on error (check lto_get_error_message() for details)
//
-lto_module_t lto_module_create_from_memory(const void* mem, size_t length,
- LLVMContextRef Ctxt)
+lto_module_t lto_module_create_from_memory(const void* mem, size_t length)
{
- return LTOModule::makeLTOModule(mem, length, *llvm::unwrap(Ctxt),
- sLastErrorString);
+ return LTOModule::makeLTOModule(mem, length, sLastErrorString);
}
@@ -158,9 +155,9 @@
// instantiates a code generator
// returns NULL if there is an error
//
-lto_code_gen_t lto_codegen_create(LLVMContextRef ContextRef)
+lto_code_gen_t lto_codegen_create(void)
{
- return new LTOCodeGenerator(*llvm::unwrap(ContextRef));
+ return new LTOCodeGenerator();
}
More information about the llvm-commits
mailing list