fix issues with getting tags on destroyed objects

emberjs · Mar 19, 2019 · 5fcc7e9 · 5fcc7e9
1 parent 81f88df
commit 5fcc7e9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
@@ -43,10 +43,13 @@ export function tagForProperty(object: any, propertyKey: string | symbol, _meta?
 export function tagFor(object: any | null, _meta?: Meta): Tag {
   if (typeof object === 'object' && object !== null) {
     let meta = _meta === undefined ? metaFor(object) : _meta;
-    return meta.writableTag(makeTag);
-  } else {
-    return CONSTANT_TAG;
+
+    if (!meta.isMetaDestroyed()) {
+      return meta.writableTag(makeTag);
+    }
   }
+
+  return CONSTANT_TAG;
 }
 
 export let dirty: (tag: Tag) => void;