Reviewers: Toon Verwaest,

Message:
PTAL

Description:
Fixes for Windows and Mac builds after r25250.

[email protected]

Please review this at https://codereview.chromium.org/717573002/

Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+5, -6 lines):
  M src/layout-descriptor.h
  M src/layout-descriptor-inl.h
  M src/objects-inl.h
  M src/string-stream.cc


Index: src/layout-descriptor-inl.h
diff --git a/src/layout-descriptor-inl.h b/src/layout-descriptor-inl.h
index 0549d83d5c2d810d2cb02f2dc6edad1326277c67..6d77bcc995693186771607d8c95790a36553fa88 100644
--- a/src/layout-descriptor-inl.h
+++ b/src/layout-descriptor-inl.h
@@ -153,7 +153,6 @@ LayoutDescriptor* LayoutDescriptor::cast_gc_safe(Object* object) {
 InobjectPropertiesHelper::InobjectPropertiesHelper(Map* map)
     : all_fields_tagged_(true),
       header_size_(0),
-      inobject_properties_count_(0),
       layout_descriptor_(LayoutDescriptor::FastPointerLayout()) {
   if (!FLAG_unbox_double_fields) return;

Index: src/layout-descriptor.h
diff --git a/src/layout-descriptor.h b/src/layout-descriptor.h
index e1d4d49a3da58e5ad444ccb5b55350e0fc2b5284..b2c61bb1c0ae4fceb884a7827890251ff65f5c85 100644
--- a/src/layout-descriptor.h
+++ b/src/layout-descriptor.h
@@ -118,7 +118,6 @@ class InobjectPropertiesHelper {
  private:
   bool all_fields_tagged_;
   int header_size_;
-  int inobject_properties_count_;
   LayoutDescriptor* layout_descriptor_;
 };
 }
Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index b093bb98d3076217306025d54ec1888cf3e61075..f5498151b07a04851d44069d00742a97abc6c352 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -7378,9 +7378,10 @@ void ExternalTwoByteString::ExternalTwoByteStringIterateBody() {
 }


-static void IterateBodyUsingLayoutDescriptor(HeapObject* object,
- int start_offset, int end_offset,
-                                             ObjectVisitor* v) {
+static inline void IterateBodyUsingLayoutDescriptor(HeapObject* object,
+                                                    int start_offset,
+                                                    int end_offset,
+                                                    ObjectVisitor* v) {
   DCHECK(FLAG_unbox_double_fields);
   DCHECK(IsAligned(start_offset, kPointerSize) &&
          IsAligned(end_offset, kPointerSize));
Index: src/string-stream.cc
diff --git a/src/string-stream.cc b/src/string-stream.cc
index 8c9c5bb3692da0d6d2a1ea3cdf2206273709b089..21f66a613061d190ad49dca044ecf122a37cef6a 100644
--- a/src/string-stream.cc
+++ b/src/string-stream.cc
@@ -353,7 +353,7 @@ void StringStream::PrintUsingMap(JSObject* js_object) {
         FieldIndex index = FieldIndex::ForDescriptor(map, i);
         if (js_object->IsUnboxedDoubleField(index)) {
           double value = js_object->RawFastDoublePropertyAt(index);
-          Add("<unboxed double> %.16g\n", value);
+          Add("<unboxed double> %.16g\n", FmtElm(value));
         } else {
           Object* value = js_object->RawFastPropertyAt(index);
           Add("%o\n", value);


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to