SI-7979 Fix quasiquotes crash on mismatch between fields and constructor

1 files changed, 8 insertions, 4 deletions

diff --git a/src/reflect/scala/reflect/internal/BuildUtils.scala b/src/reflect/scala/reflect/internal/BuildUtils.scala
index 22e2bf4cad..357109ac2c 100644
--- a/src/reflect/scala/reflect/internal/BuildUtils.scala
+++ b/src/reflect/scala/reflect/internal/BuildUtils.scala
@@ -212,11 +212,15 @@ trait BuildUtils { self: SymbolTable =>
             }
             // undo flag modifications by mergeing flag info from constructor args and fieldDefs
             val modsMap = fieldDefs.map { case ValDef(mods, name, _, _) => name -> mods }.toMap
-            val vparamss = mmap(vparamssRestoredImplicits) { vd =>
-              val originalMods = modsMap(vd.name) | (vd.mods.flags & DEFAULTPARAM)
-              atPos(vd.pos)(ValDef(originalMods, vd.name, vd.tpt, vd.rhs))
+            def ctorArgsCorrespondToFields = vparamssRestoredImplicits.flatten.forall { vd => modsMap.contains(vd.name) }
+            if (!ctorArgsCorrespondToFields) None
+            else {
+              val vparamss = mmap(vparamssRestoredImplicits) { vd =>
+                val originalMods = modsMap(vd.name) | (vd.mods.flags & DEFAULTPARAM)
+                atPos(vd.pos)(ValDef(originalMods, vd.name, vd.tpt, vd.rhs))
+              }
+              result(ctorMods, vparamss, edefs, body)
             }
-            result(ctorMods, vparamss, edefs, body)
           }
         }
       }