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

Fix build failures after rL341386. 

Reviewers: davidxl

Reviewed By: davidxl

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D51647

llvm-svn: 341391
This commit is contained in:
Hiroshi Yamauchi 2018-09-04 18:10:54 +00:00
parent 88f7285415
commit 72ee6d6000
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
View File

@ -34,7 +34,9 @@
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Transforms/Scalar.h"
#if !defined(_MSC_VER)
#include <cxxabi.h>
#endif
#include <set>
#include <sstream>
@ -446,8 +448,10 @@ static bool shouldApply(Function &F, ProfileSummaryInfo& PSI) {
return true;
const char* DemangledName = nullptr;
int Status = -1;
#if !defined(_MSC_VER)
DemangledName = abi::__cxa_demangle(Name.str().c_str(),
nullptr, nullptr, &Status);
#endif
return DemangledName && CHRFunctions.count(DemangledName);
}
@ -459,8 +463,10 @@ static void dumpIR(Function &F, const char *Label, CHRStats *Stats) {
std::string Name = F.getName().str();
const char *DemangledName = nullptr;
int Status = -1;
#if !defined(_MSC_VER)
DemangledName = abi::__cxa_demangle(Name.c_str(),
nullptr, nullptr, &Status);
#endif
if (DemangledName == nullptr) {
DemangledName = "<NOT-MANGLED>";
}
@ -1593,6 +1599,7 @@ static void assertBranchOrSelectConditionHoisted(CHRScope *Scope,
Value *V = BI->getCondition();
CHR_DEBUG(dbgs() << *V << "\n");
if (auto *I = dyn_cast<Instruction>(V)) {
(void)(I); // Unused in release build.
assert((I->getParent() == PreEntryBlock ||
!Scope->contains(I)) &&
"Must have been hoisted to PreEntryBlock or outside the scope");
@ -1606,6 +1613,7 @@ static void assertBranchOrSelectConditionHoisted(CHRScope *Scope,
Value *V = SI->getCondition();
CHR_DEBUG(dbgs() << *V << "\n");
if (auto *I = dyn_cast<Instruction>(V)) {
(void)(I); // Unused in release build.
assert((I->getParent() == PreEntryBlock ||
!Scope->contains(I)) &&
"Must have been hoisted to PreEntryBlock or outside the scope");