Convert CurrentContext and StoreContext to locations code generation scheme

runtime/vm/intermediate_language_ia32.cc

Index: runtime/vm/intermediate_language_ia32.cc
diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc
index ffcbaf243ac9f332e0ce4a706884f257df06f425..654fdee2b16561c5196730b08af375def01d01e0 100644
--- a/runtime/vm/intermediate_language_ia32.cc
+++ b/runtime/vm/intermediate_language_ia32.cc
@@ -13,55 +13,28 @@
 namespace dart {
 
 
-LocationSummary* StrictCompareComp::MakeLocationSummary() {
-  UNIMPLEMENTED();
-  return NULL;
-}
-
-
-void StrictCompareComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  UNIMPLEMENTED();
-}
-
+#define DEFINE_UNIMPLEMENTED(name)                            \
+  LocationSummary* name::MakeLocationSummary() {              \
+    UNIMPLEMENTED();                                          \
+    return NULL;                                              \
+  }                                                           \
+                                                              \
+  void name::EmitNativeCode(FlowGraphCompiler* compiler) {    \
+    UNIMPLEMENTED();                                          \
+  }
+
+DEFINE_UNIMPLEMENTED(StrictCompareComp)
+DEFINE_UNIMPLEMENTED(ClosureCallComp)
+DEFINE_UNIMPLEMENTED(InstanceCallComp)
+DEFINE_UNIMPLEMENTED(StaticCallComp)
+DEFINE_UNIMPLEMENTED(CurrentContextComp)
+DEFINE_UNIMPLEMENTED(StoreContextComp)

[srdjan, 2012/05/22 16:56:22]

All those need toi be Bailouts. Maybe next CL.

[Vyacheslav Egorov (Google), 2012/05/22 18:40:14]

It's a logical error to call EmitNativeCode if locs() == NULL, so I don't think
it should be bailout.

And MakeLocationSummary can't bailout because it does not have FlowGraphCompiler
(which has Bailout method).

I suggest the following approach for another CL: remove unimplemented from
MakeLocationSummary and let it return NULL. Then add Bailout at "driver loop"
level: e.g. pseudocode

if (instr->locs() == NULL) Bailout("unsupported instruction %s",
instr->mnemonic());

What do you think?

 
 void BindInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   UNIMPLEMENTED();
 }
 
 
-LocationSummary* ClosureCallComp::MakeLocationSummary() {
-  UNIMPLEMENTED();
-  return NULL;
-}
-
-
-void ClosureCallComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  UNIMPLEMENTED();
-}
-
-
-LocationSummary* InstanceCallComp::MakeLocationSummary() {
-  UNIMPLEMENTED();
-  return NULL;
-}
-
-
-void InstanceCallComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  UNIMPLEMENTED();
-}
-
-
-LocationSummary* StaticCallComp::MakeLocationSummary() {
-  UNIMPLEMENTED();
-  return NULL;
-}
-
-
-void StaticCallComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  UNIMPLEMENTED();
-}
-
-
 }  // namespace dart
 
 #undef __