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

Revert "[LTO] Add a function `LTOCodeGenerator::getMergedModule`" 

This reverts commit 61051e42c2.
This commit is contained in:
Shilei Tian 2021-12-13 16:31:22 -05:00
parent d6449d0d08
commit aa0981ba86
3 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
View File

@ -193,8 +193,6 @@ struct LTOCodeGenerator {
void resetMergedModule() { MergedModule.reset(); }
void DiagnosticHandler(const DiagnosticInfo &DI);
Module &getMergedModule() { return *MergedModule; }
private:
/// Verify the merged module on first call.
///

14
llvm/test/tools/llvm-lto/dump.ll
View File

@ -1,14 +0,0 @@
; RUN: llvm-as < %s > %t1
; RUN: llvm-lto --dump-linked-module %t1 2>&1 | FileCheck %s
; CHEKCK: target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
; CHECK: define void @f() {
define void @f() {
; CHECK-NEXT: entry:
entry:
; CHECK-NEXT: ret void
ret void
; CHECK-NEXT: }
}

17
llvm/tools/llvm-lto/llvm-lto.cpp
View File

@ -197,11 +197,6 @@ static cl::opt<bool>
cl::desc("Write merged LTO module to file before CodeGen"),
cl::cat(LTOCategory));
static cl::opt<bool>
DumpLinkedModule("dump-linked-module", cl::init(false),
cl::desc("Dump linked LTO module before optimize"),
cl::cat(LTOCategory));
static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore,
cl::desc("<input bitcode files>"),
cl::cat(LTOCategory));
@ -321,11 +316,11 @@ namespace {
if (!CurrentActivity.empty())
OS << ' ' << CurrentActivity;
OS << ": ";
DiagnosticPrinterRawOStream DP(OS);
DI.print(DP);
OS << '\n';
if (DI.getSeverity() == DS_Error)
exit(1);
return true;
@ -1120,14 +1115,6 @@ int main(int argc, char **argv) {
error("error compiling the code");
} else {
if (DumpLinkedModule) {
if (SaveLinkedModuleFile)
error(": -dump-linked-module must be used without -dump-linked-module");
Module &M = CodeGen.getMergedModule();
M.dump();
}
if (Parallelism != 1)
error("-j must be specified together with -o");