From 9847675095c37f15dc5867b7f9dcc2fc363f7482 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Tue, 22 Oct 2019 08:26:40 -0700
Subject: [PATCH] fix #2647

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 scripts/nightly.yaml            | 22 +++++++++++-----------
 src/cmd_context/cmd_context.cpp |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 263757185..12bd7247d 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -95,17 +95,17 @@ jobs:
        cd scripts 
        python mk_nuget_task.py ../tmp $(z3Version) $(Build.SourceVersion)
        cd ..
-  - task: NuGetCommand@2
-    inputs:
-      command: pack
-      packagesToPack: scripts/out/*.nuspec
-      packDestination: $(Build.ArtifactStagingDirectory)
-  - task: NuGetCommand@2
-    inputs: 
-      command: 'pack'
-      packagesToPack: scripts/out/*.nuspec
-      includesymbols: true
-      packDestination: $(Build.ArtifactStagingDirectory)
+#  - task: NuGetCommand@2
+#    inputs:
+#      command: pack
+#      packagesToPack: scripts/out/*.nuspec
+#      packDestination: $(Build.ArtifactStagingDirectory)
+#  - task: NuGetCommand@2
+#    inputs: 
+#      command: 'pack'
+#      packagesToPack: scripts/out/*.nuspec
+#      includesymbols: true
+#      packDestination: $(Build.ArtifactStagingDirectory)
 
 # Not available as a task?
 #  - script: | 
diff --git a/src/cmd_context/cmd_context.cpp b/src/cmd_context/cmd_context.cpp
index 1f331757a..8e844a406 100644
--- a/src/cmd_context/cmd_context.cpp
+++ b/src/cmd_context/cmd_context.cpp
@@ -2184,7 +2184,7 @@ void cmd_context::dt_eh::operator()(sort * dt, pdecl* pd) {
             m_owner.insert(a);
         }
     }
-    if (!m_owner.m_scopes.empty()) {
+    if (!m_owner.m_scopes.empty() && !m_owner.m_global_decls) {
         m_owner.pm().inc_ref(pd);
         m_owner.m_psort_inst_stack.push_back(pd);
     }