maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

InstrProf: Don't extend coverage regions into the catch keyword 

The catch keyword isn't really part of a region, so it's fairly
meaningless to extend into it. This was usually harmless, but it could
crash when catch blocks involved macros in strange ways.

llvm-svn: 243066
This commit is contained in:
Justin Bogner 2015-07-23 23:24:21 +00:00
parent 2e424da39b
commit 61bf8cb9af
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/lib/CodeGen/CoverageMappingGen.cpp
View File

@ -842,7 +842,6 @@ struct CounterCoverageMappingBuilder
}
void VisitCXXCatchStmt(const CXXCatchStmt *S) {
extendRegion(S);
propagateCounts(getRegionCounter(S), S->getHandlerBlock());
}

24
clang/test/CoverageMapping/trymacro.cpp Normal file
View File

@ -0,0 +1,24 @@
// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++11 -fexceptions -fcxx-exceptions -fprofile-instr-generate -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name trymacro.cpp %s | FileCheck %s
// CHECK: Z3fn1v:
void fn1() try { return; } // CHECK: [[@LINE]]:12 -> [[@LINE+1]]:14 = #1
catch(...) {} // CHECK: [[@LINE]]:12 -> [[@LINE]]:14 = #2
#define RETURN_BLOCK { return; }
// CHECK: Z3fn2v:
void fn2() try RETURN_BLOCK // CHECK: [[@LINE]]:12 -> [[@LINE+1]]:14 = #1
catch(...) {} // CHECK: [[@LINE]]:12 -> [[@LINE]]:14 = #2
#define TRY try
#define CATCH(x) catch (x)
// CHECK: Z3fn3v:
void fn3() TRY { return; } // CHECK: [[@LINE]]:12 -> [[@LINE+1]]:14 = #1
CATCH(...) {} // CHECK: [[@LINE]]:12 -> [[@LINE]]:14 = #2
int main() {
fn1();
fn2();
fn3();
}