Author: bogner Date: Thu Jul 23 18:24:21 2015 New Revision: 243066 URL: http://llvm.org/viewvc/llvm-project?rev=243066&view=rev Log: 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. Added: cfe/trunk/test/CoverageMapping/trymacro.cpp Modified: cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp Modified: cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp?rev=243066&r1=243065&r2=243066&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp (original) +++ cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp Thu Jul 23 18:24:21 2015 @@ -842,7 +842,6 @@ struct CounterCoverageMappingBuilder } void VisitCXXCatchStmt(const CXXCatchStmt *S) { - extendRegion(S); propagateCounts(getRegionCounter(S), S->getHandlerBlock()); } Added: cfe/trunk/test/CoverageMapping/trymacro.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/trymacro.cpp?rev=243066&view=auto ============================================================================== --- cfe/trunk/test/CoverageMapping/trymacro.cpp (added) +++ cfe/trunk/test/CoverageMapping/trymacro.cpp Thu Jul 23 18:24:21 2015 @@ -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(); +} _______________________________________________ cfe-commits mailing list cfe-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits