Merge pull request #174 from tfoleyNV/modifier-lowering-fix

Fix some issues around cloned modifiers.

3 files changed, 50 insertions, 5 deletions

diff --git a/source/core/smart-pointer.h b/source/core/smart-pointer.h
index 87cb40d70..3e64eac96 100644
--- a/source/core/smart-pointer.h
+++ b/source/core/smart-pointer.h
@@ -49,6 +49,11 @@ namespace Slang
             SLANG_ASSERT(referenceCount != 0);
             return referenceCount == 1;
         }
+
+        UInt debugGetReferenceCount()
+        {
+            return referenceCount;
+        }
     };
 
     inline void addReference(RefObject* obj)
diff --git a/source/slang/lower.cpp b/source/slang/lower.cpp
index a1b6dcf17..7a487d29f 100644
--- a/source/slang/lower.cpp
+++ b/source/slang/lower.cpp
@@ -5,6 +5,19 @@
 #include "type-layout.h"
 #include "visitor.h"
 
+// DEBUGGING
+#if 0
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <Windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#undef NOMINMAX
+#endif
+#endif
+
+
+
 namespace Slang
 {
 
@@ -2166,12 +2179,22 @@ struct LoweringVisitor
         DeclVisitor::dispatch(stmt->decl);
     }
 
+    Modifiers shallowCloneModifiers(Modifiers const& oldModifiers)
+    {
+        RefPtr<SharedModifiers> shared = new SharedModifiers();
+        shared->next = oldModifiers.first;
+
+        Modifiers newModifiers;
+        newModifiers.first = shared;
+        return newModifiers;
+    }
+
     void lowerStmtFields(
         Stmt* loweredStmt,
         Stmt* originalStmt)
     {
         loweredStmt->loc = originalStmt->loc;
-        loweredStmt->modifiers = originalStmt->modifiers;
+        loweredStmt->modifiers = shallowCloneModifiers(originalStmt->modifiers);
     }
 
     void lowerScopeStmtFields(
@@ -2367,7 +2390,7 @@ struct LoweringVisitor
 
     void lowerStmtCommon(Stmt* loweredStmt, Stmt* stmt)
     {
-        loweredStmt->modifiers = stmt->modifiers;
+        loweredStmt->modifiers = shallowCloneModifiers(stmt->modifiers);
     }
 
     void assign(
@@ -2665,7 +2688,7 @@ struct LoweringVisitor
         // HACK: just doing a shallow copy of modifiers, which will
         // suffice for most of them, but we need to do something
         // better soon.
-        loweredDecl->modifiers = decl->modifiers;
+        loweredDecl->modifiers = shallowCloneModifiers(decl->modifiers);
 
         // deal with layout stuff
 
@@ -2964,7 +2987,6 @@ struct LoweringVisitor
                 loweredDecl);
         }
 
-
         return LoweredDecl(loweredDecl);
     }
 
@@ -3209,7 +3231,7 @@ struct LoweringVisitor
             primaryVarDecl->nameAndLoc.name = getName(name);
             primaryVarDecl->type.type = tupleType;
 
-            primaryVarDecl->modifiers = originalVarDecl->modifiers;
+            primaryVarDecl->modifiers = shallowCloneModifiers(originalVarDecl->modifiers);
 
             tupleDecl->primaryDecl = primaryVarDecl;
 
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index 293b6bf9e..65abbb3f2 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -859,6 +859,16 @@ SLANG_API int spCompile(
 {
     auto req = REQ(request);
 
+#if 1
+    // By default we'd like to catch as many internal errors as possible,
+    // and report them to the user nicely (rather than just crash their
+    // application). Internally Slang currently uses exceptions for this.
+    //
+    // TODO: Consider using `setjmp()`-style escape so that we can work
+    // with applications that disable exceptions.
+    //
+    // TODO: Consider supporting Windows "Structured Exception Handling"
+    // so that we can also recover from a wider class of crashes.
     try
     {
         int anyErrors = req->executeActions();
@@ -869,6 +879,14 @@ SLANG_API int spCompile(
         req->mSink.diagnose(Slang::SourceLoc(), Slang::Diagnostics::compilationAborted);
         return 1;
     }
+#else
+    // When debugging, we probably don't want to filter out any errors, since
+    // we are probably trying to root-cause and *fix* those errors.
+    {
+        int anyErrors = req->executeActions();
+        return anyErrors;
+    }
+#endif
 }
 
 SLANG_API int