1 files changed, 8 insertions, 1 deletions
diff --git a/js/src/vm/JSAtomUtils.cpp b/js/src/vm/JSAtomUtils.cpp
index 2f8b066f0c..157e788964 100644
--- a/js/src/vm/JSAtomUtils.cpp
+++ b/js/src/vm/JSAtomUtils.cpp
@@ -666,6 +666,10 @@ JSAtom* js::AtomizeString(JSContext* cx, JSString* str) {
     return &str->asAtom();
   }
 
+  if (str->isAtomRef()) {
+    return str->atom();
+  }
+
   if (JSAtom* atom = cx->caches().stringToAtomCache.lookup(str)) {
     return atom;
   }
@@ -691,6 +695,7 @@ JSAtom* js::AtomizeString(JSContext* cx, JSString* str) {
         // not done in lookup() itself, because #including JSContext.h there
         // causes some non-trivial #include ordering issues.
         cx->markAtom(atom);
+        str->tryReplaceWithAtomRef(atom);
         return atom;
       }
     }
@@ -723,7 +728,9 @@ JSAtom* js::AtomizeString(JSContext* cx, JSString* str) {
     return nullptr;
   }
 
-  cx->caches().stringToAtomCache.maybePut(str, atom, key);
+  if (!str->tryReplaceWithAtomRef(atom)) {
+    cx->caches().stringToAtomCache.maybePut(str, atom, key);
+  }
 
   return atom;
 }