Add weka option -template-codegen-depth=<uint> to prevent crashes on …

…stack exhaustion upon deep recursion
weka · Mar 9, 2019 · 1865f29 · 1865f29
1 parent e42597e
commit 1865f29
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/dmd/dtemplate.d b/dmd/dtemplate.d
@@ -6217,6 +6217,16 @@ extern (C++) class TemplateInstance : ScopeDsymbol
      */
     final bool needsCodegen()
     {
+        version (IN_WEKA)
+        {
+            static uint callDepth;
+            callDepth++;
+            scope(exit) callDepth--;
+
+            if (global.params.templateCodegenDepth && (callDepth > global.params.templateCodegenDepth))
+                return false;
+        }
+
         // Now -allInst is just for the backward compatibility.
         if (global.params.allInst)
         {

diff --git a/dmd/globals.d b/dmd/globals.d
@@ -287,6 +287,7 @@ struct Param
         version (IN_WEKA)
         {
             bool enableWekaMods; // Enable specific Weka mods like the template instantiation mods
+            uint templateCodegenDepth; // Don't codegen templates beyond this recusion depth.
         }
     }
 }

diff --git a/dmd/globals.h b/dmd/globals.h
@@ -255,6 +255,7 @@ struct Param
 
 #if IN_WEKA
     bool enableWekaMods; // Enable specific Weka mods like the template instantiation mods
+    uint32_t templateCodegenDepth;
 #endif
 #endif
 };

diff --git a/driver/cl_options.cpp b/driver/cl_options.cpp
@@ -432,6 +432,10 @@ static cl::opt<bool, true, FlagParser<bool>> wekaMods(
     cl::desc(
         "(*) Enable specific Weka mods like the template instantiation mods"),
     cl::location(global.params.enableWekaMods), cl::init(true));
+static cl::opt<uint32_t, true>
+    templateCodegenDepth("template-codegen-depth",
+             cl::desc("Don't codegen templates beyond this recusion depth (0 = off)."),
+             cl::location(global.params.templateCodegenDepth), cl::init(0));
 #endif
 
 cl::opt<LTOKind> ltoMode(
-Original file line number
+Diff line change
@@ Expand Up / @@ -287,6 +287,7 @@ struct Param @@
             version (IN_WEKA)
             {
                 bool enableWekaMods; // Enable specific Weka mods like the template instantiation mods
+                uint templateCodegenDepth; // Don't codegen templates beyond this recusion depth.
             }
         }
     }
@@ Expand Down @@