[llvm-branch-commits] [llvm-branch] r81982 - /llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp

[Tanya Lattner]

Author: tbrethou
Date: Tue Sep 15 20:15:44 2009
New Revision: 81982

URL: http://llvm.org/viewvc/llvm-project?rev=81982&view=rev
Log:
Merge 80153 from mainline.
Rework getPersonalityIndex slightly - 0 is now a valid and not-NULL
personality function.


Modified:
    llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp

Modified: llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp?rev=81982&r1=81981&r2=81982&view=diff

==============================================================================
--- llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp Tue Sep 15 20:15:44 2009
@@ -278,7 +278,7 @@
 }
 
 /// getPersonalityIndex - Return unique index for current personality
-/// function. NULL personality function should always get zero index.
+/// function. NULL/first personality function should always get zero index.
 unsigned MachineModuleInfo::getPersonalityIndex() const {
   const Function* Personality = NULL;
   
@@ -294,8 +294,8 @@
       return i;
   }
 
-  // This should never happen
-  llvm_unreachable("Personality function should be set!");
+  // This will happen if the current personality function is
+  // in the zero index.
   return 0;
 }