Added missing case for identical types to merge when merging type var…

…iables across branches.
mcoblenz · Jan 22, 2020 · a29e12a · a29e12a
1 parent 9aeb1e2
commit a29e12a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/scala/edu/cmu/cs/obsidian/typecheck/Checker.scala b/src/main/scala/edu/cmu/cs/obsidian/typecheck/Checker.scala
@@ -443,7 +443,10 @@ class Checker(globalTable: SymbolTable, verbose: Boolean = false) {
                 Some(StateType(ct, unionStates, NotRemoteReferenceType()))
 
             case (g1@GenericType(gVar1, gBound1), g2@GenericType(gVar2, gBound2)) =>
-                if (gVar1.permissionVar.isDefined && gVar2.permissionVar.isDefined) {
+                if (g1 == g2) {
+                    Some(g1)
+                }
+                else if (gVar1.permissionVar.isDefined && gVar2.permissionVar.isDefined) {
                     Some(t1)
                 } else {
                     val typeForMismatchedPermissions =