Expand the class id to 32 bits and size field to 16 bits on 64-bit platforms.

runtime/vm/compiler_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/object.h"
@@ skipping 144 matching lines @@
   EXPECT_EQ(7, Integer::Cast(val).AsInt64Value());
 }
 
 
 TEST_CASE(EvalExpressionExhaustCIDs) {
   Library& lib = Library::Handle(Library::CoreLibrary());
 
   const String& expression = String::Handle(String::New("3 + 4"));
   Object& val = Object::Handle();
 
-  const intptr_t classTableSize = 1 << RawObject::kClassIdTagSize;
-  for (intptr_t i = 0; i < classTableSize; i++) {
-    StackZone zone(Isolate::Current());
-    val = lib.Evaluate(expression, Array::empty_array(), Array::empty_array());
-  }
-
+  // Run once to ensure everything we touch is compiled.
+  val = lib.Evaluate(expression, Array::empty_array(), Array::empty_array());
   EXPECT(!val.IsNull());
   EXPECT(!val.IsError());
   EXPECT(val.IsInteger());
   EXPECT_EQ(7, Integer::Cast(val).AsInt64Value());
+
+  intptr_t initial_class_table_size =
+      Isolate::Current()->class_table()->NumCids();
+
+  val = lib.Evaluate(expression, Array::empty_array(), Array::empty_array());
+  EXPECT(!val.IsNull());
+  EXPECT(!val.IsError());
+  EXPECT(val.IsInteger());
+  EXPECT_EQ(7, Integer::Cast(val).AsInt64Value());
+
+  intptr_t final_class_table_size =
+      Isolate::Current()->class_table()->NumCids();
+  // Eval should not eat into this non-renewable resource.
+  EXPECT_EQ(initial_class_table_size, final_class_table_size);
 }
 
 }  // namespace dart