Revert "Fix compilation with C++11." and "Allocation site support for monomorphic StringAdds in Bin…

src/hydrogen.h

 // 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 977 matching lines @@
   HBasicBlock* true_branch() const { return true_branch_; }
   HBasicBlock* false_branch() const { return false_branch_; }
 
  private:
   bool continuation_captured_;
   HBasicBlock* true_branch_;
   HBasicBlock* false_branch_;
 };
 
 
-class HAllocationMode V8_FINAL BASE_EMBEDDED {
- public:
-  explicit HAllocationMode(Handle<AllocationSite> feedback_site)
-      : current_site_(NULL), feedback_site_(feedback_site),
-        pretenure_flag_(NOT_TENURED) {}
-  explicit HAllocationMode(HValue* current_site)
-      : current_site_(current_site), pretenure_flag_(NOT_TENURED) {}
-  explicit HAllocationMode(PretenureFlag pretenure_flag)
-      : current_site_(NULL), pretenure_flag_(pretenure_flag) {}
-
-  HValue* current_site() const { return current_site_; }
-  Handle<AllocationSite> feedback_site() const { return feedback_site_; }
-
-  bool CreateAllocationMementos() const V8_WARN_UNUSED_RESULT {
-    return current_site() != NULL;
-  }
-
-  PretenureFlag GetPretenureMode() const V8_WARN_UNUSED_RESULT {
-    if (!feedback_site().is_null()) return feedback_site()->GetPretenureMode();
-    return pretenure_flag_;
-  }
-
- private:
-  HValue* current_site_;
-  Handle<AllocationSite> feedback_site_;
-  PretenureFlag pretenure_flag_;
-};
-
-
 class HGraphBuilder {
  public:
   explicit HGraphBuilder(CompilationInfo* info)
       : info_(info),
         graph_(NULL),
         current_block_(NULL),
         position_(RelocInfo::kNoPosition) {}
   virtual ~HGraphBuilder() {}
 
   HBasicBlock* current_block() const { return current_block_; }
@@ skipping 276 matching lines @@
                                    HValue* map,
                                    ElementsKind from_kind,
                                    ElementsKind to_kind,
                                    bool is_jsarray);
 
   HValue* BuildNumberToString(HValue* object, Handle<Type> type);
 
   HValue* BuildUncheckedDictionaryElementLoad(HValue* receiver,
                                               HValue* key);
 
-  // Allocates a new object according with the given allocation properties.
-  HAllocate* BuildAllocate(HValue* object_size,
-                           HType type,
-                           InstanceType instance_type,
-                           HAllocationMode allocation_mode);
-  // Computes the sum of two string lengths, taking care of overflow handling.
-  HValue* BuildAddStringLengths(HValue* left_length, HValue* right_length);
-  // Creates a cons string using the two input strings.
-  HValue* BuildCreateConsString(HValue* length,
-                                HValue* left,
-                                HValue* right,
-                                HAllocationMode allocation_mode);
+  // Computes the size for a sequential string of the given length and encoding.
+  HValue* BuildSeqStringSizeFor(HValue* length,
+                                String::Encoding encoding);
   // Copies characters from one sequential string to another.
   void BuildCopySeqStringChars(HValue* src,
                                HValue* src_offset,
                                String::Encoding src_encoding,
                                HValue* dst,
                                HValue* dst_offset,
                                String::Encoding dst_encoding,
                                HValue* length);
   // Both operands are non-empty strings.
   HValue* BuildUncheckedStringAdd(HValue* left,
                                   HValue* right,
-                                  HAllocationMode allocation_mode);
-  // Add two strings using allocation mode, validating type feedback.
+                                  PretenureFlag pretenure_flag);
+  // Both operands are strings.
   HValue* BuildStringAdd(HValue* left,
                          HValue* right,
-                         HAllocationMode allocation_mode);
+                         PretenureFlag pretenure_flag);
 
   HInstruction* BuildUncheckedMonomorphicElementAccess(
       HValue* checked_object,
       HValue* key,
       HValue* val,
       bool is_js_array,
       ElementsKind elements_kind,
       bool is_store,
       LoadKeyedHoleMode load_mode,
       KeyedAccessStoreMode store_mode);
 
   HInstruction* AddElementAccess(
       HValue* elements,
       HValue* checked_key,
       HValue* val,
       HValue* dependency,
       ElementsKind elements_kind,
       bool is_store,
       LoadKeyedHoleMode load_mode = NEVER_RETURN_HOLE);
 
   HLoadNamedField* BuildLoadNamedField(HValue* object, HObjectAccess access);
   HInstruction* AddLoadNamedField(HValue* object, HObjectAccess access);
-  HInstruction* AddLoadStringInstanceType(HValue* string);
-  HInstruction* AddLoadStringLength(HValue* string);
-  HStoreNamedField* AddStoreMapNoWriteBarrier(HValue* object, HValue* map) {
-    HStoreNamedField* store_map = Add<HStoreNamedField>(
-        object, HObjectAccess::ForMap(), map);
-    store_map->SkipWriteBarrier();
-    return store_map;
-  }
+  HInstruction* BuildLoadStringLength(HValue* object, HValue* checked_value);
   HStoreNamedField* AddStoreMapConstant(HValue* object, Handle<Map> map);
   HStoreNamedField* AddStoreMapConstantNoWriteBarrier(HValue* object,
                                                       Handle<Map> map) {
     HStoreNamedField* store_map = AddStoreMapConstant(object, map);
     store_map->SkipWriteBarrier();
     return store_map;
   }
   HLoadNamedField* AddLoadElements(HValue* object);
 
   bool MatchRotateRight(HValue* left,
                         HValue* right,
                         HValue** operand,
                         HValue** shift_amount);
 
   HValue* BuildBinaryOperation(Token::Value op,
                                HValue* left,
                                HValue* right,
                                Handle<Type> left_type,
                                Handle<Type> right_type,
                                Handle<Type> result_type,
-                               Maybe<int> fixed_right_arg,
-                               HAllocationMode allocation_mode);
+                               Maybe<int> fixed_right_arg);
 
   HLoadNamedField* AddLoadFixedArrayLength(HValue *object);
 
   HValue* AddLoadJSBuiltin(Builtins::JavaScript builtin);
 
   HValue* EnforceNumberType(HValue* number, Handle<Type> expected);
   HValue* TruncateToNumber(HValue* value, Handle<Type>* expected);
 
   void FinishExitWithHardDeoptimization(const char* reason,
                                         HBasicBlock* continuation);
@@ skipping 1273 matching lines @@
   }
 
  private:
   HGraphBuilder* builder_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HYDROGEN_H_