replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash on C++ code when compiling with -finstrument-functions. 

llvm-svn: 131435
This commit is contained in:
Ted Kremenek 2011-05-16 23:49:20 +00:00
parent 2ccfe89b3e
commit c249c411c2
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/CodeGen/CodeGenFunction.cpp
View File

@ -196,7 +196,7 @@ void CodeGenFunction::FinishFunction(SourceLocation EndLoc) {
bool CodeGenFunction::ShouldInstrumentFunction() {
if (!CGM.getCodeGenOpts().InstrumentFunctions)
return false;
if (CurFuncDecl->hasAttr<NoInstrumentFunctionAttr>())
if (!CurFuncDecl || CurFuncDecl->hasAttr<NoInstrumentFunctionAttr>())
return false;
return true;
}

30
clang/test/CodeGenCXX/instrument-functions.cpp Normal file
View File

@ -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;