Merge pull request #23821 from gottesmm/pr-1984671c8601f1f0c2087a5e22be5f3473533606
[sil] Replace some nstances of SILBuilder(...) with SILBuilderWithSco…
diff --git a/lib/SILGen/SILGenBuilder.cpp b/lib/SILGen/SILGenBuilder.cpp
index 0e2265e..d6c2bd4 100644
--- a/lib/SILGen/SILGenBuilder.cpp
+++ b/lib/SILGen/SILGenBuilder.cpp
@@ -35,9 +35,6 @@
SILGenBuilder::SILGenBuilder(SILGenFunction &SGF)
: SILBuilder(SGF.F), SGF(SGF) {}
-SILGenBuilder::SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB)
- : SILBuilder(insertBB), SGF(SGF) {}
-
SILGenBuilder::SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB,
SmallVectorImpl<SILInstruction *> *insertedInsts)
: SILBuilder(insertBB, insertedInsts), SGF(SGF) {}
diff --git a/lib/SILGen/SILGenBuilder.h b/lib/SILGen/SILGenBuilder.h
index 1809bd0..b563917 100644
--- a/lib/SILGen/SILGenBuilder.h
+++ b/lib/SILGen/SILGenBuilder.h
@@ -45,24 +45,11 @@
public:
SILGenBuilder(SILGenFunction &SGF);
- SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB);
SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB,
- SmallVectorImpl<SILInstruction *> *insertedInsts);
+ SmallVectorImpl<SILInstruction *> *insertedInsts = nullptr);
SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB,
SILBasicBlock::iterator insertInst);
- SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB)
- : SILGenBuilder(SGF, &*insertBB) {}
- SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB,
- SmallVectorImpl<SILInstruction *> *insertedInsts)
- : SILGenBuilder(SGF, &*insertBB, insertedInsts) {}
- SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB,
- SILInstruction *insertInst)
- : SILGenBuilder(SGF, &*insertBB, insertInst->getIterator()) {}
- SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB,
- SILBasicBlock::iterator insertInst)
- : SILGenBuilder(SGF, &*insertBB, insertInst) {}
-
// Create a new builder, inheriting the given builder's context and debug
// scope.
SILGenBuilder(SILGenBuilder &builder, SILBasicBlock *insertBB)
diff --git a/lib/SILGen/SILGenGlobalVariable.cpp b/lib/SILGen/SILGenGlobalVariable.cpp
index bb4df1a..5aff83c 100644
--- a/lib/SILGen/SILGenGlobalVariable.cpp
+++ b/lib/SILGen/SILGenGlobalVariable.cpp
@@ -93,7 +93,7 @@
// Global variables can be accessed directly with global_addr. Emit this
// instruction into the prolog of the function so we can memoize/CSE it in
// VarLocs.
- auto entryBB = getFunction().begin();
+ auto *entryBB = &*getFunction().begin();
SILGenBuilder prologueB(*this, entryBB, entryBB->begin());
prologueB.setTrackingList(B.getTrackingList());
diff --git a/tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp b/tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp
index 673411c..67d1e8c 100644
--- a/tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp
+++ b/tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp
@@ -15,6 +15,7 @@
#include "SourceKit/Support/Concurrency.h"
#include "SourceKit/Support/UIdent.h"
+#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Mutex.h"
#include "llvm/Support/Path.h"
@@ -82,6 +83,7 @@
std::string sourcekitd::getRuntimeLibPath() {
#if defined(_WIN32)
MEMORY_BASIC_INFORMATION mbi;
+ llvm::SmallString<128> libPath;
char path[MAX_PATH + 1];
if (!VirtualQuery(static_cast<void *>(sourcekitd_initialize), &mbi,
sizeof(mbi)))
@@ -89,7 +91,9 @@
if (!GetModuleFileNameA(static_cast<HINSTANCE>(mbi.AllocationBase), path,
MAX_PATH))
llvm_unreachable("call to GetModuleFileNameA failed");
- return llvm::sys::path::parent_path(path);
+ libPath = llvm::sys::path::parent_path(llvm::sys::path::parent_path(path));
+ llvm::sys::path::append(libPath, "lib");
+ return libPath.str();
#else
// This silly cast below avoids a C++ warning.
Dl_info info;
