Skip to content

Commit 082d4ec

Browse files
beccadaxbeccadax
committed
---
yaml --- r: 286707 b: refs/heads/master-next c: 781ce5e h: refs/heads/master i: 286705: 449432e 286703: 5385e0b
1 parent b2c8f3b commit 082d4ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+213
-250
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: a67ffadd758dfc7a0f10a8afde063b8864663208
3-
refs/heads/master-next: 27ad0028d49bc100fb9bda847b4084a619c2fa9d
3+
refs/heads/master-next: 781ce5ed5e51283dade996f4b64d8ce532c8e34f
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

‎branches/master-next/include/swift/LLVMPasses/Passes.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,8 @@ namespace swift {
3030
const llvm::PreservedAnalyses &) { return false; }
3131

3232
using AAResultBase::getModRefInfo;
33-
llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
34-
const llvm::MemoryLocation &Loc) {
35-
llvm::AAQueryInfo AAQI;
36-
return getModRefInfo(Call, Loc, AAQI);
37-
}
38-
llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
39-
const llvm::MemoryLocation &Loc,
40-
llvm::AAQueryInfo &AAQI);
33+
llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
34+
const llvm::MemoryLocation &Loc);
4135
};
4236

4337
class SwiftAAWrapperPass : public llvm::ImmutablePass {

‎branches/master-next/lib/Basic/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ macro(find_first_existing_vc_file out_var path)
3030
)
3131
endmacro()
3232

33-
set(generate_vcs_version_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromVCS.cmake")
33+
set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GetSVN.cmake")
3434

3535
function(generate_revision_inc revision_inc_var name dir)
3636
find_first_existing_vc_file(dep_file "${dir}")
@@ -39,12 +39,12 @@ function(generate_revision_inc revision_inc_var name dir)
3939
string(TOUPPER ${name} upper_name)
4040
if(DEFINED dep_file)
4141
add_custom_command(OUTPUT "${revision_inc}"
42-
DEPENDS "${dep_file}" "${generate_vcs_version_script}"
42+
DEPENDS "${dep_file}" "${get_svn_script}"
4343
COMMAND
44-
${CMAKE_COMMAND} "-DNAMES=${upper_name}"
45-
"-D${upper_name}_SOURCE_DIR=${dir}"
44+
${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${dir}"
45+
"-DFIRST_NAME=${upper_name}"
4646
"-DHEADER_FILE=${revision_inc}"
47-
-P "${generate_vcs_version_script}")
47+
-P "${get_svn_script}")
4848
else()
4949
# Generate an empty Revision.inc file if we are not using git or SVN.
5050
file(WRITE "${revision_inc}" "")

‎branches/master-next/lib/Basic/Platform.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
122122
case llvm::Triple::Ananas:
123123
case llvm::Triple::CloudABI:
124124
case llvm::Triple::DragonFly:
125-
case llvm::Triple::Emscripten:
126125
case llvm::Triple::Fuchsia:
127126
case llvm::Triple::KFreeBSD:
128127
case llvm::Triple::Lv2:
@@ -143,7 +142,6 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
143142
case llvm::Triple::AMDPAL:
144143
case llvm::Triple::HermitCore:
145144
case llvm::Triple::Hurd:
146-
case llvm::Triple::WASI:
147145
return "";
148146
case llvm::Triple::Darwin:
149147
case llvm::Triple::MacOSX:

‎branches/master-next/lib/ClangImporter/ClangImporter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,17 +1010,16 @@ ClangImporter::create(ASTContext &ctx,
10101010

10111011
// Set up the file manager.
10121012
{
1013-
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS;
10141013
if (!ctx.SearchPathOpts.VFSOverlayFiles.empty()) {
10151014
// If the clang instance has overlays it means the user has provided
10161015
// -ivfsoverlay options and swift -vfsoverlay options. We're going to
10171016
// clobber their file system with our own, so warn about it.
10181017
if (!instance.getHeaderSearchOpts().VFSOverlayFiles.empty()) {
10191018
ctx.Diags.diagnose(SourceLoc(), diag::clang_vfs_overlay_is_ignored);
10201019
}
1021-
VFS = ctx.SourceMgr.getFileSystem();
1020+
instance.setVirtualFileSystem(ctx.SourceMgr.getFileSystem());
10221021
}
1023-
instance.createFileManager(std::move(VFS));
1022+
instance.createFileManager();
10241023
}
10251024

10261025
// Don't stop emitting messages if we ever can't load a module.
@@ -1034,7 +1033,8 @@ ClangImporter::create(ASTContext &ctx,
10341033
clangDiags.setSeverity(clang::diag::err_module_not_built,
10351034
clang::diag::Severity::Error,
10361035
clang::SourceLocation());
1037-
clangDiags.setFatalsAsError(ctx.Diags.getShowDiagnosticsAfterFatalError());
1036+
clangDiags.setSuppressAfterFatalError(
1037+
!ctx.Diags.getShowDiagnosticsAfterFatalError());
10381038

10391039

10401040
// Create the associated action.

‎branches/master-next/lib/ClangImporter/ImportDecl.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8162,7 +8162,6 @@ ClangImporter::Implementation::createConstant(Identifier name, DeclContext *dc,
81628162
case clang::APValue::Array:
81638163
case clang::APValue::ComplexFloat:
81648164
case clang::APValue::ComplexInt:
8165-
case clang::APValue::FixedPoint:
81668165
case clang::APValue::LValue:
81678166
case clang::APValue::MemberPointer:
81688167
case clang::APValue::Struct:

‎branches/master-next/lib/IRGen/GenCall.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ llvm::CallSite CallEmission::emitCallSite() {
16091609
{ opaqueCallee });
16101610
opaqueCallee =
16111611
IGF.Builder.CreateBitCast(opaqueCallee, origCallee->getType());
1612-
call->setCalledFunction(fn.getFunctionType(), opaqueCallee);
1612+
call->setCalledFunction(opaqueCallee);
16131613

16141614
// Reset the insert point to after the call.
16151615
IGF.Builder.SetInsertPoint(call->getParent());

‎branches/master-next/lib/IRGen/GenClass.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1999,7 +1999,6 @@ namespace {
19991999
case llvm::Triple::MachO:
20002000
var->setSection("__DATA, __objc_const");
20012001
break;
2002-
case llvm::Triple::XCOFF:
20032002
case llvm::Triple::COFF:
20042003
var->setSection(".data");
20052004
break;

‎branches/master-next/lib/IRGen/GenDecl.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "llvm/IR/GlobalAlias.h"
4242
#include "llvm/IR/InlineAsm.h"
4343
#include "llvm/IR/Module.h"
44+
#include "llvm/IR/TypeBuilder.h"
4445
#include "llvm/IR/Value.h"
4546
#include "llvm/Support/Compiler.h"
4647
#include "llvm/Support/ConvertUTF.h"
@@ -876,7 +877,6 @@ std::string IRGenModule::GetObjCSectionName(StringRef Section,
876877
: ("__DATA," + Section + "," + MachOAttributes).str();
877878
case llvm::Triple::ELF:
878879
return Section.substr(2).str();
879-
case llvm::Triple::XCOFF:
880880
case llvm::Triple::COFF:
881881
return ("." + Section.substr(2) + "$B").str();
882882
case llvm::Triple::Wasm:
@@ -908,7 +908,6 @@ void IRGenModule::SetCStringLiteralSection(llvm::GlobalVariable *GV,
908908
}
909909
case llvm::Triple::ELF:
910910
return;
911-
case llvm::Triple::XCOFF:
912911
case llvm::Triple::COFF:
913912
return;
914913
case llvm::Triple::Wasm:
@@ -1310,7 +1309,6 @@ static std::string getDynamicReplacementSection(IRGenModule &IGM) {
13101309
case llvm::Triple::Wasm:
13111310
sectionName = "swift5_replace";
13121311
break;
1313-
case llvm::Triple::XCOFF:
13141312
case llvm::Triple::COFF:
13151313
sectionName = ".sw5repl$B";
13161314
break;
@@ -2886,7 +2884,6 @@ llvm::Constant *IRGenModule::emitSwiftProtocols() {
28862884
case llvm::Triple::Wasm:
28872885
sectionName = "swift5_protocols";
28882886
break;
2889-
case llvm::Triple::XCOFF:
28902887
case llvm::Triple::COFF:
28912888
sectionName = ".sw5prt$B";
28922889
break;
@@ -2947,7 +2944,6 @@ llvm::Constant *IRGenModule::emitProtocolConformances() {
29472944
case llvm::Triple::Wasm:
29482945
sectionName = "swift5_protocol_conformances";
29492946
break;
2950-
case llvm::Triple::XCOFF:
29512947
case llvm::Triple::COFF:
29522948
sectionName = ".sw5prtc$B";
29532949
break;
@@ -2973,7 +2969,6 @@ llvm::Constant *IRGenModule::emitTypeMetadataRecords() {
29732969
case llvm::Triple::Wasm:
29742970
sectionName = "swift5_type_metadata";
29752971
break;
2976-
case llvm::Triple::XCOFF:
29772972
case llvm::Triple::COFF:
29782973
sectionName = ".sw5tymd$B";
29792974
break;
@@ -3042,7 +3037,6 @@ llvm::Constant *IRGenModule::emitFieldDescriptors() {
30423037
case llvm::Triple::Wasm:
30433038
sectionName = "swift5_fieldmd";
30443039
break;
3045-
case llvm::Triple::XCOFF:
30463040
case llvm::Triple::COFF:
30473041
sectionName = ".sw5flmd$B";
30483042
break;
@@ -4311,10 +4305,7 @@ IRGenModule::getOrCreateHelperFunction(StringRef fnName, llvm::Type *resultTy,
43114305
llvm::FunctionType *fnTy =
43124306
llvm::FunctionType::get(resultTy, paramTys, false);
43134307

4314-
llvm::Constant *fn =
4315-
cast<llvm::Function>(Module.getOrInsertFunction(fnName, fnTy)
4316-
.getCallee()
4317-
->stripPointerCasts());
4308+
llvm::Constant *fn = Module.getOrInsertFunction(fnName, fnTy);
43184309

43194310
if (llvm::Function *def = shouldDefineHelper(*this, fn, setIsNoInline)) {
43204311
IRGenFunction IGF(*this, def);

‎branches/master-next/lib/IRGen/GenExistential.cpp

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -842,11 +842,8 @@ class OpaqueExistentialTypeInfo final :
842842
// Use copy-on-write existentials?
843843
auto fn = getAssignBoxedOpaqueExistentialBufferFunction(
844844
IGF.IGM, getLayout(), objPtrTy);
845-
auto destAddress = IGF.Builder.CreateBitCast(
846-
dest.getAddress(), cast<llvm::Function>(fn)->arg_begin()[0].getType());
847-
auto srcAddress = IGF.Builder.CreateBitCast(
848-
src.getAddress(), cast<llvm::Function>(fn)->arg_begin()[1].getType());
849-
auto call = IGF.Builder.CreateCall(fn, {destAddress, srcAddress});
845+
auto call =
846+
IGF.Builder.CreateCall(fn, {dest.getAddress(), src.getAddress()});
850847
call->setCallingConv(IGF.IGM.DefaultCC);
851848
call->setDoesNotThrow();
852849
return;
@@ -906,10 +903,7 @@ class OpaqueExistentialTypeInfo final :
906903
// Use copy-on-write existentials?
907904
auto fn = getDestroyBoxedOpaqueExistentialBufferFunction(
908905
IGF.IGM, getLayout(), addr.getAddress()->getType());
909-
auto call = IGF.Builder.CreateCall(
910-
fn, {IGF.Builder.CreateBitCast(
911-
addr.getAddress(),
912-
cast<llvm::Function>(fn)->arg_begin()->getType())});
906+
auto call = IGF.Builder.CreateCall(fn, {addr.getAddress()});
913907
call->setCallingConv(IGF.IGM.DefaultCC);
914908
call->setDoesNotThrow();
915909
return;
@@ -2051,11 +2045,8 @@ Address irgen::emitAllocateBoxedOpaqueExistentialBuffer(
20512045
/// Call a function to handle the non-fixed case.
20522046
auto *allocateFun = getAllocateBoxedOpaqueExistentialBufferFunction(
20532047
IGF.IGM, existLayout, existentialContainer.getAddress()->getType());
2054-
auto *call = IGF.Builder.CreateCall(
2055-
allocateFun,
2056-
{IGF.Builder.CreateBitCast(
2057-
existentialContainer.getAddress(),
2058-
cast<llvm::Function>(allocateFun)->arg_begin()->getType())});
2048+
auto *call =
2049+
IGF.Builder.CreateCall(allocateFun, {existentialContainer.getAddress()});
20592050
call->setCallingConv(IGF.IGM.DefaultCC);
20602051
call->setDoesNotThrow();
20612052
auto addressOfValue = IGF.Builder.CreateBitCast(call, valuePointerType);

‎branches/master-next/lib/IRGen/GenKeyPath.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ emitKeyPathComponent(IRGenModule &IGM,
902902
fnName.append("keypath_get_selector_");
903903
fnName.append(selectorName);
904904
auto fn = cast<llvm::Function>(
905-
IGM.Module.getOrInsertFunction(fnName, fnTy).getCallee());
905+
IGM.Module.getOrInsertFunction(fnName, fnTy));
906906
if (fn->empty()) {
907907
fn->setLinkage(llvm::Function::PrivateLinkage);
908908
IRGenFunction subIGF(IGM, fn);

‎branches/master-next/lib/IRGen/GenMeta.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ void IRGenModule::setTrueConstGlobal(llvm::GlobalVariable *var) {
115115
case llvm::Triple::ELF:
116116
var->setSection(".rodata");
117117
break;
118-
case llvm::Triple::XCOFF:
119118
case llvm::Triple::COFF:
120119
var->setSection(".rdata");
121120
break;

‎branches/master-next/lib/IRGen/GenReflection.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,6 @@ static std::string getReflectionSectionName(IRGenModule &IGM,
930930
switch (IGM.TargetInfo.OutputObjectFormat) {
931931
case llvm::Triple::UnknownObjectFormat:
932932
llvm_unreachable("unknown object format");
933-
case llvm::Triple::XCOFF:
934933
case llvm::Triple::COFF:
935934
assert(FourCC.size() <= 4 &&
936935
"COFF section name length must be <= 8 characters");

‎branches/master-next/lib/IRGen/IRGen.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
#include "llvm/Transforms/IPO/AlwaysInliner.h"
7171
#include "llvm/Transforms/IPO/PassManagerBuilder.h"
7272
#include "llvm/Transforms/Instrumentation.h"
73-
#include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
74-
#include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
7573
#include "llvm/Transforms/ObjCARC.h"
7674

7775
#include <thread>
@@ -127,12 +125,12 @@ static void addSwiftMergeFunctionsPass(const PassManagerBuilder &Builder,
127125
static void addAddressSanitizerPasses(const PassManagerBuilder &Builder,
128126
legacy::PassManagerBase &PM) {
129127
PM.add(createAddressSanitizerFunctionPass());
130-
PM.add(createModuleAddressSanitizerLegacyPassPass());
128+
PM.add(createAddressSanitizerModulePass());
131129
}
132130

133131
static void addThreadSanitizerPass(const PassManagerBuilder &Builder,
134132
legacy::PassManagerBase &PM) {
135-
PM.add(createThreadSanitizerLegacyPassPass());
133+
PM.add(createThreadSanitizerPass());
136134
}
137135

138136
static void addSanitizerCoveragePass(const PassManagerBuilder &Builder,
@@ -1226,7 +1224,6 @@ swift::createSwiftModuleObjectFile(SILModule &SILMod, StringRef Buffer,
12261224
switch (IGM.TargetInfo.OutputObjectFormat) {
12271225
case llvm::Triple::UnknownObjectFormat:
12281226
llvm_unreachable("unknown object format");
1229-
case llvm::Triple::XCOFF:
12301227
case llvm::Triple::COFF:
12311228
Section = COFFASTSectionName;
12321229
break;

‎branches/master-next/lib/IRGen/IRGenDebugInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
306306
// reports back a size.
307307
while (isa<llvm::DIDerivedType>(Ty) && !Ty->getSizeInBits()) {
308308
auto *DT = cast<llvm::DIDerivedType>(Ty);
309-
Ty = DT->getBaseType();
309+
Ty = DT->getBaseType().resolve();
310310
if (!Ty)
311311
return 0;
312312
}
@@ -317,7 +317,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
317317

318318
/// Return the size reported by the variable's type.
319319
static unsigned getSizeInBits(const llvm::DILocalVariable *Var) {
320-
llvm::DIType *Ty = Var->getType();
320+
llvm::DIType *Ty = Var->getType().resolve();
321321
return getSizeInBits(Ty);
322322
}
323323

‎branches/master-next/lib/IRGen/IRGenModule.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,7 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,
599599
{argTypes.begin(), argTypes.end()},
600600
/*isVararg*/ false);
601601

602-
cache =
603-
cast<llvm::Function>(Module.getOrInsertFunction(name, fnTy).getCallee());
602+
cache = Module.getOrInsertFunction(name, fnTy);
604603

605604
// Add any function attributes and set the calling convention.
606605
if (auto fn = dyn_cast<llvm::Function>(cache)) {
@@ -984,9 +983,8 @@ void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
984983
if (linkLib.shouldForceLoad()) {
985984
llvm::SmallString<64> buf;
986985
encodeForceLoadSymbolName(buf, linkLib.getName());
987-
auto ForceImportThunk = cast<llvm::Function>(
988-
Module.getOrInsertFunction(buf, llvm::FunctionType::get(VoidTy, false))
989-
.getCallee());
986+
auto ForceImportThunk =
987+
Module.getOrInsertFunction(buf, llvm::FunctionType::get(VoidTy, false));
990988

991989
const IRLinkage IRL =
992990
llvm::Triple(Module.getTargetTriple()).isOSBinFormatCOFF()

‎branches/master-next/lib/LLVMPasses/ARCEntryPointBuilder.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,9 @@ class ARCEntryPointBuilder {
251251
auto AttrList = AttributeList::get(M.getContext(), 1, Attribute::NoCapture);
252252
AttrList = AttrList.addAttribute(
253253
M.getContext(), AttributeList::FunctionIndex, Attribute::NoUnwind);
254-
CheckUnowned = cast<llvm::Function>(
255-
M.getOrInsertFunction("swift_checkUnowned", AttrList,
256-
Type::getVoidTy(M.getContext()), ObjectPtrTy)
257-
.getCallee());
254+
CheckUnowned = M.getOrInsertFunction("swift_checkUnowned", AttrList,
255+
Type::getVoidTy(M.getContext()),
256+
ObjectPtrTy);
258257
if (llvm::Triple(M.getTargetTriple()).isOSBinFormatCOFF() &&
259258
!llvm::Triple(M.getTargetTriple()).isOSCygMing())
260259
if (auto *F = llvm::dyn_cast<llvm::Function>(CheckUnowned.get()))

‎branches/master-next/lib/LLVMPasses/LLVMSwiftAA.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ static ModRefInfo getConservativeModRefForKind(const llvm::Instruction &I) {
3232
llvm_unreachable("Not a valid Instruction.");
3333
}
3434

35-
ModRefInfo SwiftAAResult::getModRefInfo(const llvm::CallBase *Call,
36-
const llvm::MemoryLocation &Loc,
37-
llvm::AAQueryInfo &AAQI) {
35+
ModRefInfo SwiftAAResult::getModRefInfo(llvm::ImmutableCallSite CS,
36+
const llvm::MemoryLocation &Loc) {
3837
// We know at compile time that certain entry points do not modify any
3938
// compiler-visible state ever. Quickly check if we have one of those
4039
// instructions and return if so.
41-
if (ModRefInfo::NoModRef == getConservativeModRefForKind(*Call))
40+
if (ModRefInfo::NoModRef ==
41+
getConservativeModRefForKind(*CS.getInstruction()))
4242
return ModRefInfo::NoModRef;
4343

4444
// Otherwise, delegate to the rest of the AA ModRefInfo machinery.
45-
return AAResultBase::getModRefInfo(Call, Loc, AAQI);
45+
return AAResultBase::getModRefInfo(CS, Loc);
4646
}
4747

4848
//===----------------------------------------------------------------------===//

‎branches/master-next/test/DebugInfo/dbgvalue-insertpt.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ for i in 0 ..< 3 {
99
// CHECK: %[[LD:[0-9]+]] = load i{{32|64}}, i{{32|64}}*
1010
// CHECK: br i1 {{%.*}}, label %[[FAIL:.*]], label %[[SUCCESS:.*]],
1111
//
12-
// CHECK: [[SUCCESS]]:
12+
// CHECK: ; <label>:[[SUCCESS]]:
1313
// CHECK: br label %[[NEXT_BB:.*]],
1414
//
15-
// CHECK: [[NEXT_BB]]:
15+
// CHECK: ; <label>:[[NEXT_BB]]:
1616
// CHECK: %[[PHI_VAL:.*]] = phi i{{32|64}} [ %[[LD]], %[[SUCCESS]] ]
1717
// CHECK: store i{{32|64}} %[[PHI_VAL]], i{{32|64}}* %i.debug
1818
// CHECK: ![[I]] = !DILocalVariable(name: "i",

‎branches/master-next/test/DebugInfo/linetable-cleanups.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func main() {
1919
markUsed("Done with the for loop")
2020
// CHECK: call {{.*}}void @"$s4main8markUsedyyxlF"
2121
// CHECK: br label
22-
// CHECK: {{[0-9]+}}:
22+
// CHECK: <label>:
2323
// CHECK: call %Ts16IndexingIteratorVySaySiGG* @"$ss16IndexingIteratorVySaySiGGWOh"(%Ts16IndexingIteratorVySaySiGG* %{{.*}}), !dbg ![[LOOPHEADER_LOC:.*]]
2424
// CHECK: call {{.*}}void @"$s4main8markUsedyyxlF"
2525
// The cleanups should share the line number with the ret stmt.

0 commit comments

Comments
 (0)