58 lines
2.8 KiB
Plaintext
58 lines
2.8 KiB
Plaintext
From d41dc9086b655f737a1b3fb58e9fb10758b7ab84 Mon Sep 17 00:00:00 2001
|
|
From: Hugh Bellamy <hughbellars@gmail.com>
|
|
Date: Tue, 21 Mar 2017 18:54:39 +0700
|
|
Subject: Fix top of tree Clang compilation errors
|
|
|
|
|
|
diff --git a/lib/SIL/Projection.cpp b/lib/SIL/Projection.cpp
|
|
index fe46b37..00767df 100644
|
|
--- a/lib/SIL/Projection.cpp
|
|
+++ b/lib/SIL/Projection.cpp
|
|
@@ -905,7 +905,7 @@ processUsersOfValue(ProjectionTree &Tree,
|
|
DEBUG(llvm::dbgs() << " " << *User);
|
|
|
|
// First try to create a Projection for User.
|
|
- auto P = Projection::Projection(User);
|
|
+ auto P = Projection(User);
|
|
|
|
// If we fail to create a projection, add User as a user to this node and
|
|
// continue.
|
|
diff --git a/lib/SILOptimizer/Transforms/SpeculativeDevirtualizer.cpp b/lib/SILOptimizer/Transforms/SpeculativeDevirtualizer.cpp
|
|
index 09a13f2..1efd3b8 100644
|
|
--- a/lib/SILOptimizer/Transforms/SpeculativeDevirtualizer.cpp
|
|
+++ b/lib/SILOptimizer/Transforms/SpeculativeDevirtualizer.cpp
|
|
@@ -488,7 +488,7 @@ static bool tryToSpeculateTarget(FullApplySite AI,
|
|
if (auto EMT = SubType.getAs<AnyMetatypeType>()) {
|
|
auto InstTy = ClassType.getSwiftRValueType();
|
|
auto *MetaTy = MetatypeType::get(InstTy, EMT->getRepresentation());
|
|
- auto CanMetaTy = CanMetatypeType::CanTypeWrapper(MetaTy);
|
|
+ auto CanMetaTy = CanMetatypeType(MetaTy);
|
|
ClassOrMetatypeType = SILType::getPrimitiveObjectType(CanMetaTy);
|
|
}
|
|
|
|
diff --git a/lib/SILOptimizer/Utils/Local.cpp b/lib/SILOptimizer/Utils/Local.cpp
|
|
index 8b265a7..4f0a2fb 100644
|
|
--- a/lib/SILOptimizer/Utils/Local.cpp
|
|
+++ b/lib/SILOptimizer/Utils/Local.cpp
|
|
@@ -2248,7 +2248,7 @@ CastOptimizer::optimizeCheckedCastBranchInst(CheckedCastBranchInst *Inst) {
|
|
auto EMT = dyn_cast<AnyMetatypeType>(EmiTy.getSwiftRValueType());
|
|
auto *MetaTy = MetatypeType::get(LoweredConcreteTy.getSwiftRValueType(),
|
|
EMT->getRepresentation());
|
|
- auto CanMetaTy = CanMetatypeType::CanTypeWrapper(MetaTy);
|
|
+ auto CanMetaTy = CanTypeWrapper<MetatypeType>(MetaTy);
|
|
auto SILMetaTy = SILType::getPrimitiveObjectType(CanMetaTy);
|
|
SILBuilderWithScope B(Inst);
|
|
auto *MI = B.createMetatype(FoundIEI->getLoc(), SILMetaTy);
|
|
@@ -2303,7 +2303,7 @@ CastOptimizer::optimizeCheckedCastBranchInst(CheckedCastBranchInst *Inst) {
|
|
// Get the SIL metatype of this type.
|
|
auto EMT = dyn_cast<AnyMetatypeType>(EMI->getType().getSwiftRValueType());
|
|
auto *MetaTy = MetatypeType::get(ConcreteTy, EMT->getRepresentation());
|
|
- auto CanMetaTy = CanMetatypeType::CanTypeWrapper(MetaTy);
|
|
+ auto CanMetaTy = CanTypeWrapper<MetatypeType>(MetaTy);
|
|
auto SILMetaTy = SILType::getPrimitiveObjectType(CanMetaTy);
|
|
SILBuilderWithScope B(Inst);
|
|
auto *MI = B.createMetatype(FoundIERI->getLoc(), SILMetaTy);
|
|
--
|
|
2.14.2
|
|
|