diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-11-21 20:18:40 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-11-21 20:18:40 +0000 |
| commit | 54075bbea7e70fea6cdb9e5e89b066118c1d314b (patch) | |
| tree | e75c0a378f234ff9e3f38c2cd2b57d6e439d7487 /include/llvm | |
| parent | 11d31dff58dbe94423478d731cb81677d2fe4b7c (diff) | |
| download | external_llvm-54075bbea7e70fea6cdb9e5e89b066118c1d314b.zip external_llvm-54075bbea7e70fea6cdb9e5e89b066118c1d314b.tar.gz external_llvm-54075bbea7e70fea6cdb9e5e89b066118c1d314b.tar.bz2 | |
Merging r195339:
------------------------------------------------------------------------
r195339 | chapuni | 2013-11-21 02:55:15 -0800 (Thu, 21 Nov 2013) | 5 lines
Revert r195317 (and r195333), "Teach ISel not to optimize 'optnone' functions."
It broke, at least, i686 target. It is reproducible with "llc -mtriple=i686-unknown".
FYI, it didn't appear to add either "-O0" or "-fast-isel".
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@195375 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
| -rw-r--r-- | include/llvm/MC/MCCodeGenInfo.h | 3 | ||||
| -rw-r--r-- | include/llvm/Target/TargetMachine.h | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/llvm/MC/MCCodeGenInfo.h b/include/llvm/MC/MCCodeGenInfo.h index 84ce934..d1765e1 100644 --- a/include/llvm/MC/MCCodeGenInfo.h +++ b/include/llvm/MC/MCCodeGenInfo.h @@ -42,9 +42,6 @@ namespace llvm { CodeModel::Model getCodeModel() const { return CMModel; } CodeGenOpt::Level getOptLevel() const { return OptLevel; } - - // Allow overriding OptLevel on a per-function basis. - void setOptLevel(CodeGenOpt::Level Level) { OptLevel = Level; } }; } // namespace llvm diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h index 11b0f5f..91e4715 100644 --- a/include/llvm/Target/TargetMachine.h +++ b/include/llvm/Target/TargetMachine.h @@ -75,8 +75,7 @@ protected: // Can only create subclasses. std::string TargetFS; /// CodeGenInfo - Low level target information such as relocation model. - /// Non-const to allow resetting optimization level per-function. - MCCodeGenInfo *CodeGenInfo; + const MCCodeGenInfo *CodeGenInfo; /// AsmInfo - Contains target specific asm information. /// @@ -214,9 +213,6 @@ public: /// Default, or Aggressive. CodeGenOpt::Level getOptLevel() const; - /// \brief Overrides the optimization level. - void setOptLevel(CodeGenOpt::Level Level) const; - void setFastISel(bool Enable) { Options.EnableFastISel = Enable; } bool shouldPrintMachineCode() const { return Options.PrintMachineCode; } |