[cfe-commits] r131435 - in /cfe/trunk: lib/CodeGen/CodeGenFunction.cpp test/CodeGenCXX/instrument-functions.cpp

[Ted Kremenek]

Author: kremenek
Date: Mon May 16 18:49:20 2011
New Revision: 131435

URL: http://llvm.org/viewvc/llvm-project?rev=131435&view=rev
Log:
Fix crash on C++ code when compiling with -finstrument-functions.

Added:
    cfe/trunk/test/CodeGenCXX/instrument-functions.cpp
Modified:
    cfe/trunk/lib/CodeGen/CodeGenFunction.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.cpp?rev=131435&r1=131434&r2=131435&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.cpp Mon May 16 18:49:20 2011
@@ -196,7 +196,7 @@
 bool CodeGenFunction::ShouldInstrumentFunction() {
   if (!CGM.getCodeGenOpts().InstrumentFunctions)
     return false;
-  if (CurFuncDecl->hasAttr<NoInstrumentFunctionAttr>())
+  if (!CurFuncDecl || CurFuncDecl->hasAttr<NoInstrumentFunctionAttr>())
     return false;
   return true;
 }

Added: cfe/trunk/test/CodeGenCXX/instrument-functions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/instrument-functions.cpp?rev=131435&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/instrument-functions.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/instrument-functions.cpp Mon May 16 18:49:20 2011
@@ -0,0 +1,30 @@
+// RUN: %clang_cc1 -S -emit-llvm -o - %s -finstrument-functions | FileCheck %s
+
+// CHECK: @_Z5test1i
+int test1(int x) {
+// CHECK: __cyg_profile_func_enter
+// CHECK: __cyg_profile_func_exit
+// CHECK: ret
+  return x;
+}
+
+// CHECK: @_Z5test2i
+int test2(int) __attribute__((no_instrument_function));
+int test2(int x) {
+// CHECK-NOT: __cyg_profile_func_enter
+// CHECK-NOT: __cyg_profile_func_exit
+// CHECK: ret
+  return x;
+}
+
+// This test case previously crashed code generation.  It exists solely
+// to test -finstrument-function does not crash codegen for this trivial
+// case.
+namespace rdar9445102 {
+  class Rdar9445102 {
+    public:
+      Rdar9445102();
+  };
+}
+static rdar9445102::Rdar9445102 s_rdar9445102Initializer;
+