Cleaned up usage of Function::code, since it may be misunderstood that it points to the only Code o…

runtime/vm/object.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1214 matching lines @@
   RawAbstractType* ParameterTypeAt(intptr_t index) const;
   void SetParameterTypeAt(intptr_t index, const AbstractType& value) const;
   void set_parameter_types(const Array& value) const;
 
   // Parameter names are valid for all valid parameter indices, and are not
   // limited to named optional parameters.
   RawString* ParameterNameAt(intptr_t index) const;
   void SetParameterNameAt(intptr_t index, const String& value) const;
   void set_parameter_names(const Array& value) const;
 
-  RawCode* code() const { return raw_ptr()->code_; }
   // Sets function's code and code's function.
   void SetCode(const Code& value) const;
+
+  // Return the most recently compiled and installed code for this function.
+  // It is not the only Code object that points to this function.
+  RawCode* CurrentCode() const { return raw_ptr()->code_; }
+
   RawCode* unoptimized_code() const { return raw_ptr()->unoptimized_code_; }
   void set_unoptimized_code(const Code& value) const;
   static intptr_t code_offset() { return OFFSET_OF(RawFunction, code_); }
   inline bool HasCode() const;
 
   RawContextScope* context_scope() const { return raw_ptr()->context_scope_; }
   void set_context_scope(const ContextScope& value) const;
 
   // Enclosing function of this local function.
   RawFunction* parent_function() const { return raw_ptr()->parent_function_; }
@@ skipping 103 matching lines @@
   }
   void set_deoptimization_counter(intptr_t value) const {
     raw_ptr()->deoptimization_counter_ = value;
   }
 
   bool is_optimizable() const {
     return raw_ptr()->is_optimizable_;
   }
   void set_is_optimizable(bool value) const;
 
+  bool HasOptimizedCode() const;
+
   intptr_t NumberOfParameters() const;
 
   bool AreValidArgumentCounts(int num_arguments, int num_named_arguments) const;
   bool AreValidArguments(int num_arguments, const Array& argument_names) const;
 
   // Fully qualified name uniquely identifying the function under gdb and during
   // ast printing. The special ':' character, if present, is replaced by '_'.
   const char* ToFullyQualifiedCString() const;
 
   // Returns true if this function has parameters that are compatible with the
@@ skipping 2340 matching lines @@
   Heap* vm_isolate_heap = Dart::vm_isolate()->heap();
   ASSERT(isolate_heap->Contains(reinterpret_cast<uword>(raw_->ptr())) ||
          vm_isolate_heap->Contains(reinterpret_cast<uword>(raw_->ptr())));
 #endif
   set_vtable((raw_ == null_) ?
              handle_vtable_ : raw_->ptr()->class_->ptr()->handle_vtable_);
 }
 
 
 bool Function::HasCode() const {
-  return code() != Code::null();
+  return raw_ptr()->code_ != Code::null();
 }
 
 
 intptr_t Field::Offset() const {
   ASSERT(!is_static());  // Offset is valid only for instance fields.
   return Smi::Value(reinterpret_cast<RawSmi*>(raw_ptr()->value_));
 }
 
 
 void Field::SetOffset(intptr_t value) const {
@@ skipping 13 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_