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;
   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;
 
@@ skipping 105 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 75 matching lines @@
   // function.
   // The function and the class share the same given name.
   static RawFunction* NewClosureFunction(const String& name,
                                          const Function& parent,
                                          intptr_t token_index);
 
   static const int kCtorPhaseInit = 1 << 0;
   static const int kCtorPhaseBody = 1 << 1;
   static const int kCtorPhaseAll = (kCtorPhaseInit | kCtorPhaseBody);
 
+  // Return the most recently compiled and installed code for this function.
+  // It is not the only Code object that point to this function.

[hausner, 2012/02/28 00:37:09]

points

[srdjan, 2012/02/28 01:18:59]

Done.

+  RawCode* CurrentCode() const { return raw_ptr()->code_; }
+
  private:
+  RawCode* code() const { return raw_ptr()->code_; }

[siva, 2012/02/28 00:52:20]

Why do you want to retain this accessor. There seems to be only one place where
this is used HasOptimizedCode() you could just access the field in that
function.

[srdjan, 2012/02/28 01:18:59]

Done.

   void set_name(const String& value) const;
   void set_kind(RawFunction::Kind value) const;
   void set_is_static(bool is_static) const;
   void set_is_const(bool is_const) const;
   void set_parent_function(const Function& value) const;
   void set_token_index(intptr_t value) const;
   void set_implicit_closure_function(const Function& value) const;
   static RawFunction* New();
 
   RawString* BuildSignature(bool instantiate,
@@ skipping 2275 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_