commit fee2eb57c48c082fc9bad024ca55683566a1c0e8
author Ted Kremenek <kremenek@apple.com> Fri Feb 17 09:18:39 2017 -0800
committer GitHub <noreply@github.com> Fri Feb 17 09:18:39 2017 -0800
tree 3668ac138aec35a00263ac3bdd88140644d43337
parent 3b174b3ec20232c8f7052681c188a49b5e7c662d
parent 034b8b8159613433bc6f6dae3d84bc5ba77ba3d1

Merge pull request #7533 from adrian-prantl/30520286

Fix a bug in GenericCloner causing an LLVM assertion

lib/SILOptimizer/Utils/GenericCloner.cpp

diff --git a/lib/SILOptimizer/Utils/GenericCloner.cpp b/lib/SILOptimizer/Utils/GenericCloner.cpp
index 2b4b9a3..25558f2 100644
--- a/lib/SILOptimizer/Utils/GenericCloner.cpp
+++ b/lib/SILOptimizer/Utils/GenericCloner.cpp
@@ -96,8 +96,10 @@
         // Try to create a new debug_value from an existing debug_value_addr.
         for (Operand *ArgUse : OrigArg->getUses()) {
           if (auto *DVAI = dyn_cast<DebugValueAddrInst>(ArgUse->getUser())) {
+            getBuilder().setCurrentDebugScope(remapScope(DVAI->getDebugScope()));
             getBuilder().createDebugValue(DVAI->getLoc(), NewArg,
                                           DVAI->getVarInfo());
+            getBuilder().setCurrentDebugScope(nullptr);
             break;
           }
         }