Merge pull request #3757 from DavidANeil:davidneil-no-inline-arrows

PiperOrigin-RevId: 353083185

Author: copybara-github

src/com/google/javascript/jscomp/InlineSimpleMethods.java

@@ -99,7 +99,7 @@ void visit(NodeTraversal t, Node callNode, Node parent, String callName) {
           // Verify this is a trivial return
           Node returned = returnedExpression(firstDefinition);
           if (returned != null) {
-            if (isPropertyTree(returned)) {
+            if (isPropertyTree(returned) && !firstDefinition.isArrowFunction()) {
               if (logger.isLoggable(Level.FINE)) {
                 logger.fine("Inlining property accessor: " + callName);
               }

test/com/google/javascript/jscomp/InlineSimpleMethodsTest.java

@@ -386,6 +386,23 @@ public void testEs6Issue2() {
             "y.foo();"));
   }
 
+  @Test
+  public void testArrowFunction() {
+    // Arrow functions cannot be trivially inlined.
+    // This is only an issue if ES6+ is being targetted,
+    // because otherwise the arrow function is removed before this pass.
+    testSame(
+        lines(
+            "class Holder {",
+            "    constructor() {",
+            "        this.val = {internal: true};",
+            "        this.context =  {getVal: () => this.val}",
+            "    }",
+            "}",
+            "",
+            "console.log(new Holder().context.getVal().internal);"));
+  }
+
   @Test
   public void testAnonymousGet() {
     // Anonymous object definition without side-effect should be removed.