[llvm-branch-commits] [llvm-branch] r142967 - in /llvm/branches/release_30: ./ lib/CodeGen/LLVMTargetMachine.cpp

[Bill Wendling]

Author: void
Date: Tue Oct 25 15:42:34 2011
New Revision: 142967

URL: http://llvm.org/viewvc/llvm-project?rev=142967&view=rev
Log:
Merging r142956:
------------------------------------------------------------------------
r142956 | grosbach | 2011-10-25 13:30:48 -0700 (Tue, 25 Oct 2011) | 4 lines

Make assert() message more informative.

PR11217.

------------------------------------------------------------------------

Modified:
    llvm/branches/release_30/   (props changed)
    llvm/branches/release_30/lib/CodeGen/LLVMTargetMachine.cpp

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 15:42:34 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869
+/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869,142956

Modified: llvm/branches/release_30/lib/CodeGen/LLVMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/lib/CodeGen/LLVMTargetMachine.cpp?rev=142967&r1=142966&r2=142967&view=diff
==============================================================================
--- llvm/branches/release_30/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/branches/release_30/lib/CodeGen/LLVMTargetMachine.cpp Tue Oct 25 15:42:34 2011
@@ -119,7 +119,8 @@
   // we'll crash later.
   // Provide the user with a useful error message about what's wrong.
   assert(AsmInfo && "MCAsmInfo not initialized."
-	 "Make sure you include the correct TargetSelect.h!");
+         "Make sure you include the correct TargetSelect.h"
+         "and that InitializeAllTargetMCs() is being invoked!");
 }
 
 bool LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM,