Revert "Add Smi::Zero and replace all Smi::FromInt(0) calls"

src/objects-inl.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Review notes:
 //
 // - The use of macros in these inline functions may seem superfluous
 // but it is absolutely needed to make sure gcc generates optimal
 // code. gcc is not happy when attempting to inline too deep.
 //
@@ skipping 287 matching lines @@
     if (filter & SKIP_STRINGS) return true;
   }
   return false;
 }
 
 
 Handle<Object> Object::NewStorageFor(Isolate* isolate,
                                      Handle<Object> object,
                                      Representation representation) {
   if (representation.IsSmi() && object->IsUninitialized(isolate)) {
-    return handle(Smi::kZero, isolate);
+    return handle(Smi::FromInt(0), isolate);
   }
   if (!representation.IsDouble()) return object;
   double value;
   if (object->IsUninitialized(isolate)) {
     value = 0;
   } else if (object->IsMutableHeapNumber()) {
     value = HeapNumber::cast(*object)->value();
   } else {
     value = object->Number();
   }
@@ skipping 1263 matching lines @@
 }
 
 
 FixedArrayBase* JSObject::elements() const {
   Object* array = READ_FIELD(this, kElementsOffset);
   return static_cast<FixedArrayBase*>(array);
 }
 
 
 void AllocationSite::Initialize() {
-  set_transition_info(Smi::kZero);
+  set_transition_info(Smi::FromInt(0));
   SetElementsKind(GetInitialFastElementsKind());
-  set_nested_site(Smi::kZero);
+  set_nested_site(Smi::FromInt(0));
   set_pretenure_data(0);
   set_pretenure_create_count(0);
   set_dependent_code(DependentCode::cast(GetHeap()->empty_fixed_array()),
                      SKIP_WRITE_BARRIER);
 }
 
 
 bool AllocationSite::IsZombie() { return pretenure_decision() == kZombie; }
 
 
@@ skipping 407 matching lines @@
 
 
 Object* WeakCell::value() const { return READ_FIELD(this, kValueOffset); }
 
 
 void WeakCell::clear() {
   // Either the garbage collector is clearing the cell or we are simply
   // initializing the root empty weak cell.
   DCHECK(GetHeap()->gc_state() == Heap::MARK_COMPACT ||
          this == GetHeap()->empty_weak_cell());
-  WRITE_FIELD(this, kValueOffset, Smi::kZero);
+  WRITE_FIELD(this, kValueOffset, Smi::FromInt(0));
 }
 
 
 void WeakCell::initialize(HeapObject* val) {
   WRITE_FIELD(this, kValueOffset, val);
   // We just have to execute the generational barrier here because we never
   // mark through a weak cell and collect evacuation candidates when we process
   // all weak cells.
   WriteBarrierMode mode = Marking::IsBlack(ObjectMarking::MarkBitFrom(this))
                               ? UPDATE_WRITE_BARRIER
                               : UPDATE_WEAK_WRITE_BARRIER;
   CONDITIONAL_WRITE_BARRIER(GetHeap(), this, kValueOffset, val, mode);
 }
 
-bool WeakCell::cleared() const { return value() == Smi::kZero; }
+
+bool WeakCell::cleared() const { return value() == Smi::FromInt(0); }
+
 
 Object* WeakCell::next() const { return READ_FIELD(this, kNextOffset); }
 
 
 void WeakCell::set_next(Object* val, WriteBarrierMode mode) {
   WRITE_FIELD(this, kNextOffset, val);
   if (mode == UPDATE_WRITE_BARRIER) {
     WRITE_BARRIER(GetHeap(), this, kNextOffset, val);
   }
 }
@@ skipping 412 matching lines @@
 }
 
 
 bool WeakFixedArray::IsEmptySlot(int index) const {
   DCHECK(index < Length());
   return Get(index)->IsSmi();
 }
 
 
 void WeakFixedArray::Clear(int index) {
-  FixedArray::cast(this)->set(index + kFirstIndex, Smi::kZero);
+  FixedArray::cast(this)->set(index + kFirstIndex, Smi::FromInt(0));
 }
 
 
 int WeakFixedArray::Length() const {
   return FixedArray::cast(this)->length() - kFirstIndex;
 }
 
 
 int WeakFixedArray::last_used_index() const {
   return Smi::cast(FixedArray::cast(this)->get(kLastUsedIndexIndex))->value();
@@ skipping 1737 matching lines @@
 #undef TYPED_ARRAY_CASE
     default:
       UNREACHABLE();
       return 0;
   }
   return element_size;
 }
 
 
 int FixedTypedArrayBase::DataSize(InstanceType type) {
-  if (base_pointer() == Smi::kZero) return 0;
+  if (base_pointer() == Smi::FromInt(0)) return 0;
   return length() * ElementSize(type);
 }
 
 
 int FixedTypedArrayBase::DataSize() {
   return DataSize(map()->instance_type());
 }
 
 
 int FixedTypedArrayBase::size() {
@@ skipping 2669 matching lines @@
 
 bool JSArrayBuffer::is_shared() { return IsShared::decode(bit_field()); }
 
 
 void JSArrayBuffer::set_is_shared(bool value) {
   set_bit_field(IsShared::update(bit_field(), value));
 }
 
 
 Object* JSArrayBufferView::byte_offset() const {
-  if (WasNeutered()) return Smi::kZero;
+  if (WasNeutered()) return Smi::FromInt(0);
   return Object::cast(READ_FIELD(this, kByteOffsetOffset));
 }
 
 
 void JSArrayBufferView::set_byte_offset(Object* value, WriteBarrierMode mode) {
   WRITE_FIELD(this, kByteOffsetOffset, value);
   CONDITIONAL_WRITE_BARRIER(GetHeap(), this, kByteOffsetOffset, value, mode);
 }
 
 
 Object* JSArrayBufferView::byte_length() const {
-  if (WasNeutered()) return Smi::kZero;
+  if (WasNeutered()) return Smi::FromInt(0);
   return Object::cast(READ_FIELD(this, kByteLengthOffset));
 }
 
 
 void JSArrayBufferView::set_byte_length(Object* value, WriteBarrierMode mode) {
   WRITE_FIELD(this, kByteLengthOffset, value);
   CONDITIONAL_WRITE_BARRIER(GetHeap(), this, kByteLengthOffset, value, mode);
 }
 
 
 ACCESSORS(JSArrayBufferView, buffer, Object, kBufferOffset)
 #ifdef VERIFY_HEAP
 ACCESSORS(JSArrayBufferView, raw_byte_offset, Object, kByteOffsetOffset)
 ACCESSORS(JSArrayBufferView, raw_byte_length, Object, kByteLengthOffset)
 #endif
 
 
 bool JSArrayBufferView::WasNeutered() const {
   return JSArrayBuffer::cast(buffer())->was_neutered();
 }
 
 
 Object* JSTypedArray::length() const {
-  if (WasNeutered()) return Smi::kZero;
+  if (WasNeutered()) return Smi::FromInt(0);
   return Object::cast(READ_FIELD(this, kLengthOffset));
 }
 
 
 uint32_t JSTypedArray::length_value() const {
   if (WasNeutered()) return 0;
   uint32_t index = 0;
   CHECK(Object::cast(READ_FIELD(this, kLengthOffset))->ToArrayLength(&index));
   return index;
 }
@@ skipping 731 matching lines @@
 
 bool AccessorPair::IsJSAccessor(Object* obj) {
   return obj->IsCallable() || obj->IsUndefined(GetIsolate());
 }
 
 
 template<typename Derived, typename Shape, typename Key>
 void Dictionary<Derived, Shape, Key>::SetEntry(int entry,
                                                Handle<Object> key,
                                                Handle<Object> value) {
-  this->SetEntry(entry, key, value, PropertyDetails(Smi::kZero));
+  this->SetEntry(entry, key, value, PropertyDetails(Smi::FromInt(0)));
 }
 
 
 template<typename Derived, typename Shape, typename Key>
 void Dictionary<Derived, Shape, Key>::SetEntry(int entry,
                                                Handle<Object> key,
                                                Handle<Object> value,
                                                PropertyDetails details) {
   Shape::SetEntry(static_cast<Derived*>(this), entry, key, value, details);
 }
@@ skipping 371 matching lines @@
   if (delta == 0) return;
   int new_count = ic_generic_count() + delta;
   if (new_count >= 0) {
     new_count &= ~Smi::kMinValue;
     WRITE_FIELD(this, kStorage3Offset, Smi::FromInt(new_count));
   }
 }
 
 
 void TypeFeedbackInfo::initialize_storage() {
-  WRITE_FIELD(this, kStorage1Offset, Smi::kZero);
-  WRITE_FIELD(this, kStorage2Offset, Smi::kZero);
-  WRITE_FIELD(this, kStorage3Offset, Smi::kZero);
+  WRITE_FIELD(this, kStorage1Offset, Smi::FromInt(0));
+  WRITE_FIELD(this, kStorage2Offset, Smi::FromInt(0));
+  WRITE_FIELD(this, kStorage3Offset, Smi::FromInt(0));
 }
 
 
 void TypeFeedbackInfo::change_own_type_change_checksum() {
   int value = Smi::cast(READ_FIELD(this, kStorage1Offset))->value();
   int checksum = OwnTypeChangeChecksum::decode(value);
   checksum = (checksum + 1) % (1 << kTypeChangeChecksumBits);
   value = OwnTypeChangeChecksum::update(value, checksum);
   // Ensure packed bit field is in Smi range.
   if (value > Smi::kMaxValue) value |= Smi::kMinValue;
@@ skipping 202 matching lines @@
 #undef WRITE_INT64_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 #undef NOBARRIER_READ_BYTE_FIELD
 #undef NOBARRIER_WRITE_BYTE_FIELD
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_OBJECTS_INL_H_