[llvm] r224004 - Just use the Module unique_ptr object directly in many places instead of separate pointer that's kept in sync with it.
Craig Topper
craig.topper at gmail.com
Wed Dec 10 23:04:52 PST 2014
Author: ctopper
Date: Thu Dec 11 01:04:52 2014
New Revision: 224004
URL: http://llvm.org/viewvc/llvm-project?rev=224004&view=rev
Log:
Just use the Module unique_ptr object directly in many places instead of separate pointer that's kept in sync with it.
Modified:
llvm/trunk/tools/llc/llc.cpp
Modified: llvm/trunk/tools/llc/llc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=224004&r1=224003&r2=224004&view=diff
==============================================================================
--- llvm/trunk/tools/llc/llc.cpp (original)
+++ llvm/trunk/tools/llc/llc.cpp Thu Dec 11 01:04:52 2014
@@ -205,7 +205,6 @@ static int compileModule(char **argv, LL
// Load the module to be compiled...
SMDiagnostic Err;
std::unique_ptr<Module> M;
- Module *mod = nullptr;
Triple TheTriple;
bool SkipModule = MCPU == "help" ||
@@ -220,16 +219,15 @@ static int compileModule(char **argv, LL
// If user just wants to list available options, skip module loading
if (!SkipModule) {
M = parseIRFile(InputFilename, Err, Context);
- mod = M.get();
- if (mod == nullptr) {
+ if (!M) {
Err.print(argv[0], errs());
return 1;
}
// If we are supposed to override the target triple, do so now.
if (!TargetTriple.empty())
- mod->setTargetTriple(Triple::normalize(TargetTriple));
- TheTriple = Triple(mod->getTargetTriple());
+ M->setTargetTriple(Triple::normalize(TargetTriple));
+ TheTriple = Triple(M->getTargetTriple());
} else {
TheTriple = Triple(Triple::normalize(TargetTriple));
}
@@ -284,7 +282,7 @@ static int compileModule(char **argv, LL
if (SkipModule)
return 0;
- assert(mod && "Should have exited if we didn't have a module!");
+ assert(M && "Should have exited if we didn't have a module!");
TargetMachine &Target = *target.get();
if (GenerateSoftFloatCalls)
@@ -306,7 +304,7 @@ static int compileModule(char **argv, LL
// Add the target data from the target machine, if it exists, or the module.
if (const DataLayout *DL = Target.getSubtargetImpl()->getDataLayout())
- mod->setDataLayout(DL);
+ M->setDataLayout(DL);
PM.add(new DataLayoutPass());
if (RelaxAll.getNumOccurrences() > 0 &&
@@ -348,7 +346,7 @@ static int compileModule(char **argv, LL
// Before executing passes, print the final values of the LLVM options.
cl::PrintOptionValues();
- PM.run(*mod);
+ PM.run(*M);
}
// Declare success.
More information about the llvm-commits
mailing list