[BUGFIX release] Consumes tags after fully getting values

packages/@ember/-internals/metal/lib/property_get.ts

@@ -105,31 +105,11 @@ export function get(obj: object, keyName: string): any {
   let value: any;
 
   if (isObjectLike) {
-    let tracking = isTracking();
-
-    if (tracking) {
-      consume(tagForProperty(obj, keyName));
-    }
-
     if (DEBUG && HAS_NATIVE_PROXY) {
       value = getPossibleMandatoryProxyValue(obj, keyName);
     } else {
       value = obj[keyName];
     }
-
-    if (tracking) {
-      // Add the tag of the returned value if it is an array, since arrays
-      // should always cause updates if they are consumed and then changed
-      if (Array.isArray(value) || isEmberArray(value)) {
-        consume(tagForProperty(value, '[]'));
-      }
-
-      // Add the value of the content if the value is a proxy. This is because
-      // content changes the truthiness/falsiness of the proxy.
-      if (isProxy(value)) {
-        consume(tagForProperty(value, 'content'));
-      }
-    }
   } else {
     value = obj[keyName];
   }
@@ -141,18 +121,31 @@ export function get(obj: object, keyName: string): any {
       typeof (obj as MaybeHasUnknownProperty).unknownProperty === 'function'
     ) {
       if (DEBUG) {
-        let ret;
-
         deprecateMutationsInAutotrackingTransaction!(() => {
-          ret = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
+          value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
         });
-
-        return ret;
       } else {
-        return (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
+        value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
       }
     }
   }
+
+  if (isObjectLike && isTracking()) {
+    consume(tagForProperty(obj, keyName));
+
+    // Add the tag of the returned value if it is an array, since arrays
+    // should always cause updates if they are consumed and then changed
+    if (Array.isArray(value) || isEmberArray(value)) {
+      consume(tagForProperty(value, '[]'));
+    }
+
+    // Add the value of the content if the value is a proxy. This is because
+    // content changes the truthiness/falsiness of the proxy.
+    if (isProxy(value)) {
+      consume(tagForProperty(value, 'content'));
+    }
+  }
+
   return value;
 }
 

packages/@ember/-internals/metal/tests/tracked/validation_test.js

@@ -402,5 +402,25 @@ moduleFor(
         });
       }, /You attempted to update `foo` on `EmberObject`, but it had already been used previously in the same computation/);
     }
+
+    ['@test get() does not entangle in the autotracking stack until after retrieving the value'](
+      assert
+    ) {
+      assert.expect(0);
+
+      class EmberObject {
+        get foo() {
+          notifyPropertyChange(this, 'foo');
+
+          return 123;
+        }
+      }
+
+      let obj = new EmberObject();
+
+      track(() => {
+        get(obj, 'foo');
+      });
+    }
   }
 );