Convert UnaryOpStub to a HydrogenCodeStub

src/code-stubs-hydrogen.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 93 matching lines @@
     SINGLE,
     MULTIPLE
   };
 
   HValue* BuildArrayConstructor(ElementsKind kind,
                                 bool disable_allocation_sites,
                                 ArgumentClass argument_class);
   HValue* BuildInternalArrayConstructor(ElementsKind kind,
                                         ArgumentClass argument_class);
 
+  HInstruction* BuildUnaryOp(
+      HValue* input, Handle<Type> type, Token::Value operation);
+
  private:
   HValue* BuildArraySingleArgumentConstructor(JSArrayBuilder* builder);
   HValue* BuildArrayNArgumentsConstructor(JSArrayBuilder* builder,
                                           ElementsKind kind);
 
   SmartArrayPointer<HParameter*> parameters_;
   HValue* arguments_length_;
   CompilationInfoWithZone info_;
   CodeStubInterfaceDescriptor* descriptor_;
   HContext* context_;
@@ skipping 619 matching lines @@
     if_nil.Else();
     if_nil.Return(graph()->GetConstant0());
   }
   if_nil.End();
   return continuation.IsTrueReachable()
       ? graph()->GetConstant1()
       : graph()->GetConstantUndefined();
 }
 
 
+Handle<Code> UnaryOpStub::GenerateCode() {

[danno, 2013/06/27 13:31:06]

Move this down after the BuildCode method for UnaryOpStub

[oliv, 2013/06/27 17:20:48]

Done.

+  return DoGenerateCode(this);
+}
+
+
+HInstruction* CodeStubGraphBuilderBase::BuildUnaryOp(HValue* input,

[danno, 2013/06/27 13:31:06]

I wouldn't put this on the BuilderBase. If there is really no way to share this
code with the OptimizedGraphBuilder, then just make it a static method.

[oliv, 2013/06/27 17:20:48]

Done.

+    Handle<Type> type, Token::Value operation) {
+
+  // Prevent unwanted HChange being inserted to ensure that the stub
+  // deopts on newly encountered types.
+  if (!type->Maybe(Type::Double())) {
+    input = AddInstruction(new(zone())
+        HForceRepresentation(input, Representation::Smi()));
+  }
+
+  // We only handle the numeric cases here
+  Handle<Type> numeric_type = handle(
+    Type::Intersect(type, handle(Type::Number(), isolate())), isolate());
+
+  switch (operation) {
+    default:
+      UNREACHABLE();
+    case Token::SUB:
+      return BuildSub(input, numeric_type, context());
+    case Token::BIT_NOT:
+      return BuildBitNot(input, numeric_type);
+  }
+}
+
+
+template <>
+HValue* CodeStubGraphBuilder<UnaryOpStub>::BuildCodeInitializedStub() {
+  UnaryOpStub* stub = casted_stub();
+  Handle<Type> type = stub->GetType(graph()->isolate());
+  HValue* input = GetParameter(0);
+
+  if (!type->Is(Type::Number())) {
+    // If we expect to see other things than Numbers, we will create a generic
+    // stub, which handles all numbers and calls into the runtime for the rest.
+    IfBuilder if_number(this);
+    if_number.If<HIsNumberAndBranch>(input);
+    if_number.Then();
+      HInstruction* res = BuildUnaryOp(input, type, stub->operation());

[danno, 2013/06/27 13:31:06]

Yeah, I know it's a generated if, but I don't think indentation should be
changed (here and below)

[oliv, 2013/06/27 17:20:48]

Done.

+      if_number.Return(AddInstruction(res));
+    if_number.Else();
+      AddInstruction(new(zone()) HPushArgument(GetParameter(0)));
+      if_number.Return(AddInstruction(new(zone()) HCallConstantFunction(
+            stub->ToJSFunction(isolate()), 1)));
+    if_number.End();
+    return graph()->GetConstantUndefined();
+  }
+
+  return AddInstruction(BuildUnaryOp(input, type, stub->operation()));
+}
+
+
 Handle<Code> CompareNilICStub::GenerateCode() {

[danno, 2013/06/27 13:31:06]

Move this up to be under the CompareNil BuildCode method

[oliv, 2013/06/27 17:20:48]

Done.

   return DoGenerateCode(this);
 }
 
 
 template <>
 HValue* CodeStubGraphBuilder<ToBooleanStub>::BuildCodeInitializedStub() {
   ToBooleanStub* stub = casted_stub();
 
   IfBuilder if_true(this);
   if_true.If<HBranch>(GetParameter(0), stub->GetTypes());
   if_true.Then();
     if_true.Return(graph()->GetConstant1());
   if_true.Else();
   if_true.End();
   return graph()->GetConstant0();
 }
 
 
 Handle<Code> ToBooleanStub::GenerateCode() {
   return DoGenerateCode(this);
 }
 
 
 } }  // namespace v8::internal