add support for initializing multi-dim array (dotnet#5011)

tonerdo · May 3, 2020 · ed626d6 · ed626d6
1 parent e4131da
commit ed626d6
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs b/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs
@@ -313,7 +313,8 @@ public void InterpretMethod(ref CallInterceptorArgs callInterceptorArgs)
                         InterpretLoadConstant((string)_methodIL.GetObject(reader.ReadILToken()));
                         break;
                     case ILOpcode.newobj:
-                        throw new NotImplementedException();
+                        InterpretNewObj(reader.ReadILToken());
+                        break;
                     case ILOpcode.castclass:
                         throw new NotImplementedException();
                     case ILOpcode.isinst:
@@ -2645,5 +2646,26 @@ private void InterpretCall(int token)
             if (!signature.ReturnType.IsVoid)
                 _stack.Push(callInfo.ReturnValue);
         }
+
+        private void InterpretNewObj(int token)
+        {
+            MethodDesc method = (MethodDesc)_methodIL.GetObject(token);
+            MethodSignature signature = method.Signature;
+            TypeDesc owningType = method.OwningType;
+
+            if (owningType.IsArray)
+            {
+                int[] lengths = new int[signature.Length];
+
+                for (int i = 0; i < signature.Length; i++)
+                {
+                    lengths[i] = PopWithValidation().AsInt32();
+                }
+
+                Array array = RuntimeAugments.NewMultiDimArray(owningType.GetRuntimeTypeHandle(), lengths, null);
+                _stack.Push(StackItem.FromObjectRef(array));
+                return;
+            }
+        }
     }
 }