зеркало из https://github.com/mozilla/gecko-dev.git
68 строки
2.6 KiB
Diff
68 строки
2.6 KiB
Diff
From 44847b2e9838888e1536c90ad442a3958362139a Mon Sep 17 00:00:00 2001
|
|
From: Marco Castelluccio <mcastelluccio@mozilla.com>
|
|
Date: Fri, 13 Oct 2017 13:49:15 +0000
|
|
Subject: [PATCH] Disable gcov instrumentation of functions using funclet-based
|
|
exception handling
|
|
|
|
Summary: This patch fixes the crash from https://bugs.llvm.org/show_bug.cgi?id=34659 and https://bugs.llvm.org/show_bug.cgi?id=34833.
|
|
|
|
Reviewers: rnk, majnemer
|
|
|
|
Reviewed By: rnk, majnemer
|
|
|
|
Subscribers: majnemer, llvm-commits
|
|
|
|
Differential Revision: https://reviews.llvm.org/D38223
|
|
|
|
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315677 91177308-0d34-0410-b5e6-96231b3b80d8
|
|
---
|
|
lib/Transforms/Instrumentation/GCOVProfiling.cpp | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
|
|
index 3154c1939ea..67ca8172b0d 100644
|
|
--- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
|
|
+++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
|
|
@@ -21,6 +21,7 @@
|
|
#include "llvm/ADT/StringExtras.h"
|
|
#include "llvm/ADT/StringMap.h"
|
|
#include "llvm/ADT/UniqueVector.h"
|
|
+#include "llvm/Analysis/EHPersonalities.h"
|
|
#include "llvm/IR/DebugInfo.h"
|
|
#include "llvm/IR/DebugLoc.h"
|
|
#include "llvm/IR/IRBuilder.h"
|
|
@@ -502,6 +503,13 @@ static bool functionHasLines(Function &F) {
|
|
return false;
|
|
}
|
|
|
|
+static bool isUsingFuncletBasedEH(Function &F) {
|
|
+ if (!F.hasPersonalityFn()) return false;
|
|
+
|
|
+ EHPersonality Personality = classifyEHPersonality(F.getPersonalityFn());
|
|
+ return isFuncletEHPersonality(Personality);
|
|
+}
|
|
+
|
|
static bool shouldKeepInEntry(BasicBlock::iterator It) {
|
|
if (isa<AllocaInst>(*It)) return true;
|
|
if (isa<DbgInfoIntrinsic>(*It)) return true;
|
|
@@ -542,6 +550,8 @@ void GCOVProfiler::emitProfileNotes() {
|
|
DISubprogram *SP = F.getSubprogram();
|
|
if (!SP) continue;
|
|
if (!functionHasLines(F)) continue;
|
|
+ // TODO: Functions using funclet-based EH are currently not supported.
|
|
+ if (isUsingFuncletBasedEH(F)) continue;
|
|
|
|
// gcov expects every function to start with an entry block that has a
|
|
// single successor, so split the entry block to make sure of that.
|
|
@@ -619,7 +629,10 @@ bool GCOVProfiler::emitProfileArcs() {
|
|
DISubprogram *SP = F.getSubprogram();
|
|
if (!SP) continue;
|
|
if (!functionHasLines(F)) continue;
|
|
+ // TODO: Functions using funclet-based EH are currently not supported.
|
|
+ if (isUsingFuncletBasedEH(F)) continue;
|
|
if (!Result) Result = true;
|
|
+
|
|
unsigned Edges = 0;
|
|
for (auto &BB : F) {
|
|
TerminatorInst *TI = BB.getTerminator();
|