AllocationSites for all literals

src/allocation-site-scopes.h

 // Copyright 2013 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
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef V8_HYDROGEN_OSR_H_
-#define V8_HYDROGEN_OSR_H_
+#ifndef V8_ALLOCATION_SITE_SCOPES_H_
+#define V8_ALLOCATION_SITE_SCOPES_H_
 
-#include "hydrogen.h"
 #include "ast.h"
+#include "handles.h"
+#include "objects.h"
 #include "zone.h"
 
 namespace v8 {
 namespace internal {
 
-// Responsible for building graph parts related to OSR and otherwise
-// setting up the graph to do an OSR compile.
-class HOsrBuilder : public ZoneObject {
+
+class AllocationSiteContext {

[Hannes Payer (out of office), 2013/10/11 17:53:27]

Would it make sense to make AllocationSiteContext the base class of the Creation
and Usage Scope?

[mvstanton, 2013/10/14 14:31:42]

Indeed, that works nicely.

  public:
-  explicit HOsrBuilder(HOptimizedGraphBuilder* builder)
-    : unoptimized_frame_slots_(0),
-      builder_(builder),
-      osr_entry_(NULL),
-      osr_loop_entry_(NULL),
-      osr_values_(NULL) { }
+  AllocationSiteContext(Isolate* isolate, bool activated) {
+    isolate_ = isolate;
+    activated_ = activated;
+  };
+  Handle<AllocationSite> top() { return top_; }
+  Handle<AllocationSite> current() { return current_; }
+  // If activated, then recursively create sites/mementos
+  bool activated() const { return activated_; }
 
-  // Creates the loop entry block for the given statement, setting up OSR
-  // entries as necessary, and sets the current block to the new block.
-  HBasicBlock* BuildOsrLoopEntry(IterationStatement* statement);
+ private:
+  friend class AllocationSiteCreationScope;
+  friend class AllocationSiteUsageScope;
 
-  // Process the hydrogen graph after it has been completed, performing
-  // any OSR-specific cleanups or changes.
-  void FinishGraph();
-
-  // Process the OSR values and phis after initial graph optimization.
-  void FinishOsrValues();
-
-  // Return the number of slots in the unoptimized frame at the entry to OSR.
-  int UnoptimizedFrameSlots() const {
-    return unoptimized_frame_slots_;
+  void set_current(AllocationSite* site) {
+    *(current_.location()) = site;
   }
 
-  bool HasOsrEntryAt(IterationStatement* statement);
+  Isolate* isolate_;
+  Handle<AllocationSite> top_;
+  Handle<AllocationSite> current_;
+  bool activated_;
+};
 
+
+class AllocationSiteCreationScope {
+ public:
+  explicit AllocationSiteCreationScope(AllocationSiteContext* context);
+  Handle<Object> RecordTransitionInfo(Handle<Object> transition_info);
  private:
-  int unoptimized_frame_slots_;
-  HOptimizedGraphBuilder* builder_;
-  HBasicBlock* osr_entry_;
-  HBasicBlock* osr_loop_entry_;
-  ZoneList<HUnknownOSRValue*>* osr_values_;
+  AllocationSiteContext* site_context_;
+  Handle<AllocationSite> current_;
 };
 
+
+class AllocationSiteUsageScope {
+ public:
+  AllocationSiteUsageScope(AllocationSiteContext* context,
+                           Handle<Object> expected_transition_info);
+  AllocationSiteUsageScope(AllocationSiteContext* context,
+                           Handle<AllocationSite> top,
+                           Handle<Object> expected_transition_info);
+};
+
+
 } }  // namespace v8::internal
 
-#endif  // V8_HYDROGEN_OSR_H_
+#endif  // V8_ALLOCATION_SITE_SCOPES_H_