[cfe-commits] r107858 - in /cfe/trunk: lib/CodeGen/CGCall.cpp test/CXX/except/except.spec/p14-ir.cpp test/CodeGenCXX/destructors.cpp

[John McCall]

Author: rjmccall
Date: Thu Jul  8 01:48:12 2010
New Revision: 107858

URL: http://llvm.org/viewvc/llvm-project?rev=107858&view=rev
Log:
Mark calls to 'throw()' functions as nounwind, and mark the functions nounwind
as well.


Modified:
    cfe/trunk/lib/CodeGen/CGCall.cpp
    cfe/trunk/test/CXX/except/except.spec/p14-ir.cpp
    cfe/trunk/test/CodeGenCXX/destructors.cpp

Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=107858&r1=107857&r2=107858&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Thu Jul  8 01:48:12 2010
@@ -684,6 +684,12 @@
   if (TargetDecl) {
     if (TargetDecl->hasAttr<NoThrowAttr>())
       FuncAttrs |= llvm::Attribute::NoUnwind;
+    else if (const FunctionDecl *Fn = dyn_cast<FunctionDecl>(TargetDecl)) {
+      const FunctionProtoType *FPT = Fn->getType()->getAs<FunctionProtoType>();
+      if (FPT && FPT->hasEmptyExceptionSpec())
+        FuncAttrs |= llvm::Attribute::NoUnwind;
+    }
+
     if (TargetDecl->hasAttr<NoReturnAttr>())
       FuncAttrs |= llvm::Attribute::NoReturn;
     if (TargetDecl->hasAttr<ConstAttr>())

Modified: cfe/trunk/test/CXX/except/except.spec/p14-ir.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/except/except.spec/p14-ir.cpp?rev=107858&r1=107857&r2=107858&view=diff
==============================================================================
--- cfe/trunk/test/CXX/except/except.spec/p14-ir.cpp (original)
+++ cfe/trunk/test/CXX/except/except.spec/p14-ir.cpp Thu Jul  8 01:48:12 2010
@@ -27,18 +27,14 @@
 
 void test(X2 x2, X3 x3, X5 x5) {
   // CHECK: define linkonce_odr void @_ZN2X2C1ERKS_
-  // CHECK-NOT: }
-  // CHECK: ret void
-  // CHECK-NOT: }
-  // CHECK: call void @__cxa_call_unexpected
-  // CHECK: }
+  // CHECK:      call void @_ZN2X2C2ERKS_({{.*}}) nounwind
+  // CHECK-NEXT: ret void
+  // CHECK-NEXT: }
   X2 x2a(x2);
   // CHECK: define linkonce_odr void @_ZN2X3C1ERKS_
-  // CHECK-NOT: }
-  // CHECK: ret void
-  // CHECK-NOT: }
-  // CHECK: call void @__cxa_call_unexpected
-  // CHECK: }
+  // CHECK:      call void @_ZN2X3C2ERKS_({{.*}}) nounwind
+  // CHECK-NEXT: ret void
+  // CHECK-NEXT: }
   X3 x3a(x3);
   // CHECK: define linkonce_odr void @_ZN2X5C1ERS_
   // CHECK-NOT: call void @__cxa_call_unexpected
@@ -60,14 +56,20 @@
 
 void test() {
   // CHECK: define linkonce_odr void @_ZN2X8C1Ev
-  // CHECK-NOT: }
-  // CHECK: ret void
-  // CHECK-NOT: }
-  // CHECK: call void @__cxa_call_unexpected
-  // CHECK: }
+  // CHECK:      call void @_ZN2X8C2Ev({{.*}}) nounwind
+  // CHECK-NEXT: ret void
   X8();
   // CHECK: define linkonce_odr void @_ZN2X9C1Ev
-  // CHECK-NOT: call void @__cxa_call_unexpected
-  // CHECK: ret void
+  // CHECK:      call void @_ZN2X9C2Ev({{.*}}){{$}}
+  // CHECK-NEXT: ret void
   X9();
+
+  // CHECK: define linkonce_odr void @_ZN2X9C2Ev
+  // CHECK:      call void @_ZN2X6C2Ev({{.*}}) nounwind
+  // CHECK-NEXT: call void @_ZN2X7C2Ev({{.*}}){{$}}
+  // CHECK: ret void
+
+  // CHECK: define linkonce_odr void @_ZN2X8C2Ev
+  // CHECK:      call void @_ZN2X6C2Ev({{.*}}) nounwind
+  // CHECK-NEXT: ret void
 }

Modified: cfe/trunk/test/CodeGenCXX/destructors.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/destructors.cpp?rev=107858&r1=107857&r2=107858&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/destructors.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/destructors.cpp Thu Jul  8 01:48:12 2010
@@ -45,7 +45,8 @@
   allocator::~allocator() throw() { foo(); }
 
   // CHECK: define linkonce_odr void @_ZN6PR752617allocator_derivedD1Ev
-  // CHECK: call void @__cxa_call_unexpected
+  // CHECK-NOT: call void @__cxa_call_unexpected
+  // CHECK:     }
   void foo() {
     allocator_derived ad;
   }
@@ -268,13 +269,11 @@
 
   // CHECK: define internal void @_ZN5test312_GLOBAL__N_11DD0Ev(
   // CHECK: invoke void @_ZN5test312_GLOBAL__N_11DD1Ev(
-  // CHECK: call void @_ZdlPv(
+  // CHECK: call void @_ZdlPv({{.*}}) nounwind
   // CHECK: ret void
   // CHECK: call i8* @llvm.eh.exception(
-  // CHECK: invoke void @_ZdlPv
+  // CHECK: call void @_ZdlPv({{.*}}) nounwind
   // CHECK: call void @_Unwind_Resume_or_Rethrow
-  // CHECK: call i8* @llvm.eh.exception(
-  // CHECK: call void @_ZSt9terminatev(
 
   // Checked at top of file:
   // @_ZN5test312_GLOBAL__N_11DD1Ev = alias internal {{.*}} @_ZN5test312_GLOBAL__N_11DD2Ev
@@ -295,13 +294,11 @@
 
   // CHECK: define internal void @_ZN5test312_GLOBAL__N_11CD0Ev(
   // CHECK: invoke void @_ZN5test312_GLOBAL__N_11CD1Ev(
-  // CHECK: call void @_ZdlPv(
+  // CHECK: call void @_ZdlPv({{.*}}) nounwind
   // CHECK: ret void
   // CHECK: call i8* @llvm.eh.exception()
-  // CHECK: invoke void @_ZdlPv(
+  // CHECK: call void @_ZdlPv({{.*}}) nounwind
   // CHECK: call void @_Unwind_Resume_or_Rethrow(
-  // CHECK: call i8* @llvm.eh.exception()
-  // CHECK: call void @_ZSt9terminatev()
 
   // CHECK: define internal void @_ZThn8_N5test312_GLOBAL__N_11CD1Ev(
   // CHECK: getelementptr inbounds i8* {{.*}}, i64 -8