Preview of a first step towards unification of hydrogen calls

src/hydrogen-instructions.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 831 matching lines @@
 }
 
 
 void HUnaryCall::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
   stream->Add(" ");
   stream->Add("#%d", argument_count());
 }
 
 
+void HCallJSFunction::PrintDataTo(StringStream* stream) {
+  OperandAt(0)->PrintNameTo(stream);
+  stream->Add(" ");
+  OperandAt(1)->PrintNameTo(stream);
+  stream->Add(" ");
+  stream->Add("#%d", argument_count());
+}
+
+
+HCallJSFunction* HCallJSFunction::New(Zone* zone,
+                            HValue* context,

[Toon Verwaest, 2014/01/14 15:33:50]

Either align HValue* context with Zone* zone, or move Zone* zone one line lower
and use 4-space indent.

[Jarin, 2014/01/14 19:08:08]

Done.

+                            HValue* function,
+                            HValue* call_kind_value,
+                            int argument_count,
+                            bool pass_argument_count) {
+  bool has_stack_check = false;
+  if (function->IsConstant()) {
+    HConstant* fun_const = HConstant::cast(function);
+    Handle<JSFunction> jsfun =
+      Handle<JSFunction>::cast(fun_const->handle(zone->isolate()));

[Toon Verwaest, 2014/01/14 15:33:50]

4-space indent.

[Jarin, 2014/01/14 19:08:08]

Done.

+    has_stack_check = !jsfun.is_null() &&
+        (jsfun->code()->kind() == Code::FUNCTION ||
+         jsfun->code()->kind() == Code::OPTIMIZED_FUNCTION);
+  }
+
+  return new(zone) HCallJSFunction(
+      function, call_kind_value, argument_count, pass_argument_count,
+      has_stack_check);
+}
+
+
+
+
 void HBinaryCall::PrintDataTo(StringStream* stream) {
   first()->PrintNameTo(stream);
   stream->Add(" ");
   second()->PrintNameTo(stream);
   stream->Add(" ");
   stream->Add("#%d", argument_count());
 }
 
 
 void HBoundsCheck::ApplyIndexChange() {
@@ skipping 105 matching lines @@
 
 
 void HBoundsCheckBaseIndexInformation::PrintDataTo(StringStream* stream) {
   stream->Add("base: ");
   base_index()->PrintNameTo(stream);
   stream->Add(", check: ");
   base_index()->PrintNameTo(stream);
 }
 
 
-void HCallConstantFunction::PrintDataTo(StringStream* stream) {
-  if (IsApplyFunction()) {
-    stream->Add("optimized apply ");
-  } else {
-    stream->Add("%o ", function()->shared()->DebugName());
+void HCallWithDescriptor::PrintDataTo(StringStream* stream) {
+  for (int i = 0; i < OperandCount(); i++) {
+    OperandAt(i)->PrintNameTo(stream);
+    stream->Add(" ");
   }
   stream->Add("#%d", argument_count());
 }
 
 
-void HCallNamed::PrintDataTo(StringStream* stream) {
-  stream->Add("%o ", *name());
-  HUnaryCall::PrintDataTo(stream);
-}
-
-
 void HCallGlobal::PrintDataTo(StringStream* stream) {
   stream->Add("%o ", *name());
   HUnaryCall::PrintDataTo(stream);
 }
 
 
-void HCallKnownGlobal::PrintDataTo(StringStream* stream) {
-  stream->Add("%o ", target()->shared()->DebugName());
-  stream->Add("#%d", argument_count());
-}
-
-
 void HCallNewArray::PrintDataTo(StringStream* stream) {
   stream->Add(ElementsKindToString(elements_kind()));
   stream->Add(" ");
   HBinaryCall::PrintDataTo(stream);
 }
 
 
 void HCallRuntime::PrintDataTo(StringStream* stream) {
   stream->Add("%o ", *name());
   if (save_doubles() == kSaveFPRegs) {
@@ skipping 3414 matching lines @@
       break;
     case kExternalMemory:
       stream->Add("[external-memory]");
       break;
   }
 
   stream->Add("@%d", offset());
 }
 
 } }  // namespace v8::internal