mozilla-inbound: changeset 100481:1e6e5607105dcca8a2de7e7f68a74f9402015b3c

author	Steve Fink <sfink@mozilla.com>
	Wed, 25 Jul 2012 16:06:33 -0700
changeset 100481	1e6e5607105dcca8a2de7e7f68a74f9402015b3c
parent 100480	eeb58cbbb35292e9f64d29c3f6c7e5e9a2e0a1d6
child 100482	bdca2e424ca8d3d01d4b0dd23202eb9d5244c97c
push id	12521
push user	sfink@mozilla.com
push date	Wed, 25 Jul 2012 23:31:17 +0000
treeherder	mozilla-inbound@bdca2e424ca8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	768626
milestone	17.0a1
first release with	nightly linux32 20db7c6d82cc / 17.0a1 / 20120726052803 / files nightly linux64 20db7c6d82cc / 17.0a1 / 20120726052803 / files nightly mac 20db7c6d82cc / 17.0a1 / 20120726052803 / files nightly win32 20db7c6d82cc / 17.0a1 / 20120726052803 / files nightly win64 20db7c6d82cc / 17.0a1 / 20120726052803 / files
last release without	nightly linux32 ef20925bc2a5 / 17.0a1 / 20120725030556 / files nightly linux64 ef20925bc2a5 / 17.0a1 / 20120725030556 / files nightly mac ef20925bc2a5 / 17.0a1 / 20120725030556 / files nightly win32 ef20925bc2a5 / 17.0a1 / 20120725030556 / files nightly win64 ef20925bc2a5 / 17.0a1 / 20120725030556 / files

--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -74,17 +74,20 @@ class PropertyId
     { }
 
     PropertyName * asName() const {
         return JSID_TO_STRING(id)->asAtom().asPropertyName();
     }
     SpecialId asSpecial() const {
         return JSID_TO_SPECIALID(id);
     }
-    jsid asId() const {
+    const jsid &asId() const {
+        return id;
+    }
+    jsid &asId() {
         return id;
     }
 
     bool operator==(const PropertyId &rhs) const { return id == rhs.id; }
     bool operator!=(const PropertyId &rhs) const { return id != rhs.id; }
 };
 
 /*