Revert change to Platform.excutable and add Platform.resolvedExecutable

runtime/bin/platform.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 BIN_PLATFORM_H_
 #define BIN_PLATFORM_H_
 
 #include "bin/builtin.h"
 
 
@@ skipping 28 matching lines @@
   static char** Environment(intptr_t* count);
   static void FreeEnvironment(char** env, intptr_t count);
 
   static char* ResolveExecutablePath();
 
   // Stores the executable name.
   static void SetExecutableName(const char* executable_name) {
     executable_name_ = executable_name;
   }
   static const char* GetExecutableName() {
-    if (!executable_name_resolved_) {
+    return executable_name_;
+  }
+  static const char* GetResolvedExecutableName() {
+    if (resolved_executable_name_ == NULL) {
       // Try to resolve the executable path using platform specific APIs.
-      char* path = Platform::ResolveExecutablePath();
-      if (path != NULL) {
-        executable_name_ = path;
-      }
-      executable_name_resolved_ = true;
+      resolved_executable_name_ = Platform::ResolveExecutablePath();
     }
-    return executable_name_;
+    return resolved_executable_name_;
   }
 
   // Stores and gets the package root.
   static void SetPackageRoot(const char* package_root) {
     package_root_ = package_root;
   }
   static const char* GetPackageRoot() {
     return package_root_;
   }
 
   // Stores and gets the flags passed to the executable.
   static void SetExecutableArguments(int script_index, char** argv) {
     script_index_ = script_index;
     argv_ = argv;
   }
   static int GetScriptIndex() {
     return script_index_;
   }
   static char** GetArgv() {
     return argv_;
   }
 
  private:
   // The path to the executable.
   static const char* executable_name_;
-  // State to indicate whether the executable name has been resolved.
-  static bool executable_name_resolved_;
+  // The path to the resolved executable.
+  static const char* resolved_executable_name_;
 
   static const char* package_root_;
   static int script_index_;
   static char** argv_;  // VM flags are argv_[1 ... script_index_ - 1]
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(Platform);
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_PLATFORM_H_