fix inlined optional record pattern matching

Author: mununki

jscomp/ml/typecore.ml

@@ -1153,6 +1153,7 @@ and type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env
       let label_is_optional ld =
         match ld.lbl_repres with
         | Record_optional_labels lbls -> Ext_list.mem_string lbls ld.lbl_name
+        | Record_inlined {optional_labels} -> Ext_list.mem_string optional_labels ld.lbl_name
         | _ -> false in
       let process_optional_label (ld, pat) =
         let exp_optional_attr =

jscomp/test/record_regression.js

@@ -99,63 +99,136 @@ pm0 = ir0.TAG === /* V0 */0 ? [
 
 var pm1;
 
-pm1 = ir1.TAG === /* V0 */0 ? [
+if (ir1.TAG === /* V0 */0) {
+  var x1 = "v1";
+  var x0 = "v0";
+  pm1 = x1 !== undefined ? [
+      x0,
+      x1,
+      3
+    ] : [
+      x0,
+      "n/a",
+      3
+    ];
+} else {
+  pm1 = [
     "v0",
-    "v1",
-    3
-  ] : [
-    "v0",
-    undefined,
+    "n/a",
     "v1"
   ];
+}
 
 var pm2;
 
-pm2 = ir2.TAG === /* V0 */0 ? [
-    "v0",
-    "v1",
-    2,
-    3
-  ] : [
+if (ir2.TAG === /* V0 */0) {
+  var x1$1 = "v1";
+  var x0$1 = "v0";
+  if (x1$1 !== undefined) {
+    var x2 = 2;
+    pm2 = x2 !== undefined ? [
+        x0$1,
+        x1$1,
+        x2,
+        3
+      ] : [
+        x0$1,
+        x1$1,
+        0,
+        3
+      ];
+  } else {
+    var x2$1 = 2;
+    pm2 = x2$1 !== undefined ? [
+        x0$1,
+        "n/a",
+        x2$1,
+        3
+      ] : [
+        x0$1,
+        "n/a",
+        0,
+        3
+      ];
+  }
+} else {
+  pm2 = [
     "v0",
-    undefined,
-    undefined,
+    "n/a",
+    0,
     "v1"
   ];
+}
 
 function inlinedRecord(ir) {
   if (ir.TAG !== /* V0 */0) {
     return [
             ir.y0,
             "n/a",
-            undefined,
+            0,
             ir.y1
           ];
   }
-  var x3 = ir.x3;
-  var x2 = ir.x2;
   var x1 = ir.x1;
   var x0 = ir.x0;
-  if (Caml_obj.equal(x1, "x1")) {
-    return [
-            x0,
-            "x1!",
-            x2,
-            x3
-          ];
-  } else if (x1 !== undefined) {
+  if (x1 !== undefined) {
+    switch (x1) {
+      case "x1" :
+          var x2 = ir.x2;
+          if (x2 !== undefined) {
+            return [
+                    x0,
+                    "x1",
+                    x2,
+                    ir.x3
+                  ];
+          }
+          break;
+      case "xx1" :
+          var x2$1 = ir.x2;
+          if (x2$1 !== undefined) {
+            return [
+                    x0,
+                    "xx1",
+                    x2$1,
+                    ir.x3
+                  ];
+          }
+          break;
+      default:
+        
+    }
+    var x2$2 = ir.x2;
+    if (x2$2 !== undefined) {
+      return [
+              x0,
+              x1,
+              x2$2,
+              ir.x3
+            ];
+    } else {
+      return [
+              x0,
+              x1,
+              0,
+              ir.x3
+            ];
+    }
+  }
+  var x2$3 = ir.x2;
+  if (x2$3 !== undefined) {
     return [
             x0,
-            x1,
-            x2,
-            x3
+            "n/a",
+            x2$3,
+            ir.x3
           ];
   } else {
     return [
             x0,
-            "not existed",
-            x2,
-            x3
+            "n/a",
+            0,
+            ir.x3
           ];
   }
 }

jscomp/test/record_regression.res

@@ -123,19 +123,24 @@ let pm0 = switch ir0 {
 }
 let pm1 = switch ir1 {
   | V0({x0, x1, x3}) => (x0, x1, x3)
-  | V1({y0, y1}) => (y0, None, y1)
+  | V0({x0, x1: ?None, x3}) => (x0, "n/a", x3)
+  | V1({y0, y1}) => (y0, "n/a", y1)
 }
 let pm2 = switch ir2 {
   | V0({x0, x1, x2, x3}) => (x0, x1, x2, x3)
-  | V1({y0, y1}) => (y0, None, None, y1)
+  | V0({x0, x1: ?None, x2, x3}) => (x0, "n/a", x2, x3)
+  | V0({x0, x1, x2: ?None, x3}) => (x0, x1, 0, x3)
+  | V0({x0, x1: ?None, x2: ?None, x3}) => (x0, "n/a", 0, x3)
+  | V1({y0, y1}) => (y0, "n/a", 0, y1)
 }
 let inlinedRecord = ir => switch ir {
-  | V0({x0, x1, x2, x3}) if x1 == Some("x1") => (x0, "x1!", x2, x3)
-  | V0({x0, x1, x2, x3}) => switch x1 {
-    | Some(x1) => (x0, x1, x2, x3)
-    | None => (x0, "not existed", x2, x3)
-  }
-  | V1({y0, y1}) => (y0, "n/a", None, y1)
+  | V0({x0, x1: ?Some("x1"), x2, x3}) => (x0, "x1", x2, x3)
+  | V0({x0, x1: "xx1", x2, x3}) => (x0, "xx1", x2, x3)
+  | V0({x0, x1, x2, x3}) => (x0, x1, x2, x3)
+  | V0({x0, x1: ?None, x2, x3}) => (x0, "n/a", x2, x3)
+  | V0({x0, x1, x2: ?None, x3}) => (x0, x1, 0, x3)
+  | V0({x0, x1: ?None, x2: ?None, x3}) => (x0, "n/a", 0, x3)
+  | V1({y0, y1}) => (y0, "n/a", 0, y1)
 }
 let pm3 = inlinedRecord(ir2)
 let pm4 = inlinedRecord(ir3)

lib/4.06.1/unstable/js_compiler.ml

@@ -41877,6 +41877,7 @@ and type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env
       let label_is_optional ld =
         match ld.lbl_repres with
         | Record_optional_labels lbls -> Ext_list.mem_string lbls ld.lbl_name
+        | Record_inlined {optional_labels} -> Ext_list.mem_string optional_labels ld.lbl_name
         | _ -> false in
       let process_optional_label (ld, pat) =
         let exp_optional_attr =

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -41877,6 +41877,7 @@ and type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env
       let label_is_optional ld =
         match ld.lbl_repres with
         | Record_optional_labels lbls -> Ext_list.mem_string lbls ld.lbl_name
+        | Record_inlined {optional_labels} -> Ext_list.mem_string optional_labels ld.lbl_name
         | _ -> false in
       let process_optional_label (ld, pat) =
         let exp_optional_attr =

lib/4.06.1/whole_compiler.ml

@@ -218049,6 +218049,7 @@ and type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env
       let label_is_optional ld =
         match ld.lbl_repres with
         | Record_optional_labels lbls -> Ext_list.mem_string lbls ld.lbl_name
+        | Record_inlined {optional_labels} -> Ext_list.mem_string optional_labels ld.lbl_name
         | _ -> false in
       let process_optional_label (ld, pat) =
         let exp_optional_attr =