From 7f341da9eb11236ba0c63f3e8a2c422dd1724f06 Mon Sep 17 00:00:00 2001 From: Chris Garrett Date: Mon, 18 Mar 2019 11:54:40 -0700 Subject: [PATCH] fix issues with getting tags on destroyed objects --- packages/@ember/-internals/metal/lib/tags.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts index 9150f85b484..d23b689dc66 100644 --- 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;