This is an archive of the discontinued LLVM Phabricator instance.

Differential D71485

[profile] Fix a crash when -fprofile-remapping-file= triggers an error
ClosedPublic

Authored by MaskRay on Dec 13 2019, 11:18 AM.

Details

Reviewers
rsmith
wenlei
wmi
Commits
rG193da743db63: [profile] Fix a crash when -fprofile-remapping-file= triggers an error

Diff Detail

Event Timeline

MaskRay created this revision.Dec 13 2019, 11:18 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptDec 13 2019, 11:18 AM
Herald added subscribers: llvm-commits, cfe-commits, hiraditya. · View Herald Transcript
Harbormaster completed remote builds in B42478: Diff 233840.Dec 13 2019, 11:19 AM
wmi accepted this revision.Dec 13 2019, 11:28 AM

LGTM.

This revision is now accepted and ready to land.Dec 13 2019, 11:28 AM
MaskRay updated this revision to Diff 233843.Dec 13 2019, 11:39 AM

Delete unused declaration

Harbormaster completed remote builds in B42481: Diff 233843.Dec 13 2019, 11:46 AM
Closed by commit rG193da743db63: [profile] Fix a crash when -fprofile-remapping-file= triggers an error (authored by MaskRay). · Explain WhyDec 13 2019, 11:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
test/
CodeGenCXX/
Inputs/
1 line
7 lines
llvm/
lib/
Transforms/
IPO/
3 lines

Diff 233844

clang/test/CodeGenCXX/Inputs/profile-remap-error.map

  • This file was added.
name unmangled ignored

clang/test/CodeGenCXX/profile-remap-error.cpp

  • This file was added.
// REQUIRES: x86-registered-target
// RUN: not %clang_cc1 -triple x86_64-linux-gnu -fprofile-sample-use=%S/Inputs/profile-remap.samples -fprofile-remapping-file=%S/Inputs/profile-remap-error.map -fexperimental-new-pass-manager -O2 %s -emit-llvm -o - 2>&1 | FileCheck %s
// CHECK: error: {{.*}}/profile-remap-error.map:1: Could not demangle 'unmangled' as a <name>; invalid mangling?
// CHECK-NEXT: error: {{.*}}/profile-remap-error.map: Could not create remapper: Malformed sample profile data
// CHECK-NEXT: error: {{.*}}/profile-remap.samples: Could not open profile: Malformed sample profile data

llvm/lib/Transforms/IPO/SampleProfile.cpp

Show First 20 Lines • Show All 1,967 Lines • ▼ Show 20 LinesPreservedAnalyses SampleProfileLoaderPass::run(Module &M,
}; };
SampleProfileLoader SampleLoader( SampleProfileLoader SampleLoader(
ProfileFileName.empty() ? SampleProfileFile : ProfileFileName, ProfileFileName.empty() ? SampleProfileFile : ProfileFileName,
ProfileRemappingFileName.empty() ? SampleProfileRemappingFile ProfileRemappingFileName.empty() ? SampleProfileRemappingFile
: ProfileRemappingFileName, : ProfileRemappingFileName,
IsThinLTOPreLink, GetAssumptionCache, GetTTI); IsThinLTOPreLink, GetAssumptionCache, GetTTI);
SampleLoader.doInitialization(M); if (!SampleLoader.doInitialization(M))
return PreservedAnalyses::all();
ProfileSummaryInfo *PSI = &AM.getResult<ProfileSummaryAnalysis>(M); ProfileSummaryInfo *PSI = &AM.getResult<ProfileSummaryAnalysis>(M);
CallGraph &CG = AM.getResult<CallGraphAnalysis>(M); CallGraph &CG = AM.getResult<CallGraphAnalysis>(M);
if (!SampleLoader.runOnModule(M, &AM, PSI, &CG)) if (!SampleLoader.runOnModule(M, &AM, PSI, &CG))
return PreservedAnalyses::all(); return PreservedAnalyses::all();
return PreservedAnalyses::none(); return PreservedAnalyses::none();
} }