Author: void Date: Wed Jul 30 01:21:43 2014 New Revision: 214288 URL: http://llvm.org/viewvc/llvm-project?rev=214288&view=rev Log: Merging r214287: ------------------------------------------------------------------------ r214287 | chandlerc | 2014-07-29 22:44:04 -0700 (Tue, 29 Jul 2014) | 9 lines
Don't manually (and forcibly) run the verifier on the entire module from the jump instruction table pass. First, the verifier is already built into all the tools. The test case is adapted to just run llvm-as demonstrating that we still catch the broken module. Second, the verifier is *extremely* slow. This was responsible for very significant compile time regressions. If you have deployed a Clang binary anywhere from r210280 to this commit, you really want to re-deploy. ------------------------------------------------------------------------ Modified: llvm/branches/release_35/ (props changed) llvm/branches/release_35/lib/CodeGen/JumpInstrTables.cpp llvm/branches/release_35/test/Verifier/jumptable.ll Propchange: llvm/branches/release_35/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 30 01:21:43 2014 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,213653,213749,213815,213847,213880,213884,213894-213895,213915,214129 +/llvm/trunk:155241,213653,213749,213815,213847,213880,213884,213894-213895,213915,214129,214287 Modified: llvm/branches/release_35/lib/CodeGen/JumpInstrTables.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/CodeGen/JumpInstrTables.cpp?rev=214288&r1=214287&r2=214288&view=diff ============================================================================== --- llvm/branches/release_35/lib/CodeGen/JumpInstrTables.cpp (original) +++ llvm/branches/release_35/lib/CodeGen/JumpInstrTables.cpp Wed Jul 30 01:21:43 2014 @@ -251,10 +251,6 @@ FunctionType *JumpInstrTables::transform } bool JumpInstrTables::runOnModule(Module &M) { - // Make sure the module is well-formed, especially with respect to jumptable. - if (verifyModule(M)) - return false; - JITI = &getAnalysis<JumpInstrTableInfo>(); // Get the set of jumptable-annotated functions. Modified: llvm/branches/release_35/test/Verifier/jumptable.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/Verifier/jumptable.ll?rev=214288&r1=214287&r2=214288&view=diff ============================================================================== --- llvm/branches/release_35/test/Verifier/jumptable.ll (original) +++ llvm/branches/release_35/test/Verifier/jumptable.ll Wed Jul 30 01:21:43 2014 @@ -1,4 +1,4 @@ -; RUN: not llc <%s 2>&1 | FileCheck %s +; RUN: not llvm-as -disable-output %s 2>&1 | FileCheck %s define i32 @f() jumptable { ret i32 0 @@ -6,4 +6,3 @@ define i32 @f() jumptable { ; CHECK: Attribute 'jumptable' requires 'unnamed_addr' ; CHECK: i32 ()* @f -; CHECK: LLVM ERROR: Broken function found, compilation aborted! _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits