[llvm-commits] [llvm] r132053 - in /llvm/trunk/include/llvm: Attributes.h Function.h

[Rafael Espindola]

Author: rafael
Date: Wed May 25 07:54:08 2011
New Revision: 132053

URL: http://llvm.org/viewvc/llvm-project?rev=132053&view=rev
Log:
Fix some issues Duncan found in the previous commit.

I kept the reference to the ABI since that is the common case. The
-fno-asynchronous-unwind-tables option is a user controlled way of breaking
the ABI.

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/include/llvm/Function.h

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=132053&r1=132052&r2=132053&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Wed May 25 07:54:08 2011
@@ -78,9 +78,9 @@
 /// uses tables for both, the semantics are:
 /// nil                = Needs an entry because an exception might pass by.
 /// nounwind           = No need for an entry
-/// ehframe            = Needs an entry because the ABI says so and because
+/// uwtable            = Needs an entry because the ABI says so and because
 ///                      an exception might pass by.
-/// ehframe + nounwind = Needs an entry because the ABI says so.
+/// uwtable + nounwind = Needs an entry because the ABI says so.
 
 /// @brief Attributes that only apply to function parameters.
 const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture;

Modified: llvm/trunk/include/llvm/Function.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=132053&r1=132052&r2=132053&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Wed May 25 07:54:08 2011
@@ -253,7 +253,8 @@
     else removeFnAttr(Attribute::NoUnwind);
   }
 
-  /// @brief True if the ABI mandates this function be in a unwind table.
+  /// @brief True if the ABI mandates (or the user requested) that this
+  /// function be in a unwind table.
   bool hasUWTable() const {
     return hasFnAttr(Attribute::UWTable);
   }
@@ -264,7 +265,7 @@
       removeFnAttr(Attribute::UWTable);
   }
 
-  /// @brief True if this function needs in a unwind table.
+  /// @brief True if this function needs an unwind table.
   bool needsUnwindTableEntry() const {
     return hasUWTable() || !doesNotThrow();
   }