| commit | 9441aeac4ce7187feacc86f9238233a57e9e8be1 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Wed Aug 28 12:45:53 2019 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Wed Aug 28 11:41:49 2019 +0000 |
| tree | 66d61cac643ee63b023529e0fe0a8e47dc0a54db | |
| parent | 7b428735d3cff4a6aaa088ca869380f2dcfc93ea [diff] |
Strengthen workaround for inlining into initializers Change-Id: I2f5b6e94ece66ed8bbf3a2649ba1de8b28e2704c
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java index d9e8efe..2ca0f00 100644 --- a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java +++ b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
@@ -184,7 +184,7 @@ // We don't inline into constructors when producing class files since this can mess up // the stackmap, see b/136250031 - if (method.isInitializer() + if (method.isInstanceInitializer() && appView.options().isGeneratingClassFiles() && reason != Reason.FORCE) { return false;