averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-04-27 00:29:08 -07:00
parent c197010436 6b854ea961
commit b87673dc82
23 changed files with 63 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/swift/SIL/SILFunction.h
View File

@@ -17,13 +17,13 @@
#ifndef SWIFT_SIL_SILFUNCTION_H
#define SWIFT_SIL_SILFUNCTION_H
#include "swift/AST/ASTNode.h"
#include "swift/AST/ResilienceExpansion.h"
#include "swift/Basic/ProfileCounter.h"
#include "swift/SIL/SILBasicBlock.h"
#include "swift/SIL/SILDebugScope.h"
#include "swift/SIL/SILLinkage.h"
#include "swift/SIL/SILPrintContext.h"
#include "swift/SIL/SILProfiler.h"
#include "llvm/ADT/StringMap.h"
/// The symbol name used for the program entry point function.
@@ -35,6 +35,7 @@ namespace swift {
class ASTContext;
class SILInstruction;
class SILModule;
class SILProfiler;
enum IsBare_t { IsNotBare, IsBare };
enum IsTransparent_t { IsNotTransparent, IsTransparent };
@@ -266,10 +267,7 @@ public:
Profiler = InheritedProfiler;
}
void createProfiler(ASTNode Root, ForDefinition_t forDefinition) {
assert(!Profiler && "Function already has a profiler");
Profiler = SILProfiler::create(Module, forDefinition, Root);
}
void createProfiler(ASTNode Root, ForDefinition_t forDefinition);
void discardProfiler() { Profiler = nullptr; }