From 68f475faf747c537591aa8a29bd9cdaf12da820b Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 6 Mar 2014 04:55:35 +0000 Subject: Refactor PGO code in preparation for handling non-C/C++ code. Move the PGO.assignRegionCounters() call out of StartFunction, because that function is called from many places where it does not make sense to do PGO instrumentation (e.g., compiler-generated helper functions). Change several functions to take a StringRef argument for the unique name associated with a function, so that the name can be set differently for things like Objective-C methods and block literals. llvm-svn: 203073 --- clang/lib/CodeGen/CodeGenFunction.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenFunction.cpp') diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index c550aaded723..d0f1cb6b2588 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -589,7 +589,6 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, if (CGM.getCodeGenOpts().InstrumentForProfiling) EmitMCountInstrumentation(); - PGO.assignRegionCounters(GD); if (CGM.getPGOData() && D) { // Turn on InlineHint attribute for hot functions. if (CGM.getPGOData()->isHotFunction(CGM.getMangledName(GD))) @@ -771,6 +770,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, StartFunction(GD, ResTy, Fn, FnInfo, Args, BodyRange.getBegin()); // Generate the body of the function. + PGO.assignRegionCounters(GD.getDecl(), CGM.getMangledName(GD)); if (isa(FD)) EmitDestructorBody(Args); else if (isa(FD)) @@ -831,7 +831,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, if (!CurFn->doesNotThrow()) TryMarkNoThrow(CurFn); - PGO.emitWriteoutFunction(CurGD); + PGO.emitWriteoutFunction(CGM.getMangledName(CurGD)); PGO.destroyRegionCounters(); } -- cgit v1.2.3