feat(r8): Propagate class-level synthesized flag to members

src/cache/raw.rs

@@ -577,7 +577,11 @@ impl<'data> ProguardCache<'data> {
             .get(&member.method)
             .copied()
             .unwrap_or_default();
-        let is_synthesized = method_info.is_synthesized as u8;
+        let class_synthesized = parsed
+            .class_infos
+            .get(&member.method.receiver.name())
+            .is_some_and(|ci| ci.is_synthesized);
+        let is_synthesized = (method_info.is_synthesized || class_synthesized) as u8;
         let is_outline = method_info.is_outline as u8;
 
         let outline_pairs: Vec<OutlinePair> = member

src/mapper.rs

@@ -95,7 +95,8 @@ struct ClassMapping<'s> {
     members: HashMap<&'s str, ClassMembers<'s>>,
     #[expect(
         unused,
-        reason = "It is currently unknown what effect a synthesized class has."
+        reason = "Class-level synthesized is propagated to members in resolve_mapping; \
+                  kept here for potential future class-level queries."
     )]
     is_synthesized: bool,
 }
@@ -549,7 +550,13 @@ impl<'s> ProguardMapper<'s> {
             .get(&member.method)
             .copied()
             .unwrap_or_default();
-        let is_synthesized = method_info.is_synthesized;
+        // A member is considered synthesized if either its own method info
+        // or its owning class is marked synthesized.
+        let class_synthesized = parsed
+            .class_infos
+            .get(&member.method.receiver.name())
+            .is_some_and(|ci| ci.is_synthesized);
+        let is_synthesized = method_info.is_synthesized || class_synthesized;
         let is_outline = method_info.is_outline;
 
         let outline_callsite_positions = member.outline_callsite_positions.clone();

tests/r8-synthetic.rs

@@ -0,0 +1,249 @@
+//! Tests for R8 synthetic / lambda method retracing fixtures.
+//!
+//! These tests are based on the R8 retrace test suite from:
+//! src/test/java/com/android/tools/r8/retrace/stacktraces/
+//!
+//! Note: this crate does NOT filter out synthesized frames.  Instead it
+//! propagates the `method_synthesized` flag so that callers (e.g. Sentry
+//! symbolicator) can decide whether to strip them.
+
+use proguard::{ProguardCache, ProguardMapper, ProguardMapping, StackFrame};
+
+// =============================================================================
+// SyntheticLambdaMethodStackTrace
+// =============================================================================
+
+const SYNTHETIC_LAMBDA_METHOD_MAPPING: &str = "\
+# {\"id\":\"com.android.tools.r8.mapping\",\"version\":\"1.0\"}
+example.Main -> example.Main:
+    1:1:void main(java.lang.String[]):123 -> main
+example.Foo -> a.a:
+    5:5:void lambda$main$0():225 -> a
+    3:3:void runIt():218 -> b
+    2:2:void main():223 -> c
+example.Foo$$ExternalSyntheticLambda0 -> a.b:
+    void run(example.Foo) -> a
+      # {\"id\":\"com.android.tools.r8.synthesized\"}
+";
+
+#[test]
+fn test_synthetic_lambda_method_stacktrace() {
+    let input = "\
+Exception in thread \"main\" java.lang.NullPointerException
+  at a.a.a(a.java:5)
+  at a.b.a(Unknown Source)
+  at a.a.b(a.java:3)
+  at a.a.c(a.java:2)
+  at example.Main.main(Main.java:1)
+";
+
+    // Synthetic frames are kept in the output; callers filter via method_synthesized().
+    let expected = "\
+Exception in thread \"main\" java.lang.NullPointerException
+    at example.Foo.lambda$main$0(Foo.java:225)
+    at example.Foo$$ExternalSyntheticLambda0.run(Foo.java:0)
+    at example.Foo.runIt(Foo.java:218)
+    at example.Foo.main(Foo.java:223)
+    at example.Main.main(Main.java:123)
+";
+
+    let mapper = ProguardMapper::from(SYNTHETIC_LAMBDA_METHOD_MAPPING);
+    let actual = mapper.remap_stacktrace(input).unwrap();
+    assert_eq!(actual.trim(), expected.trim());
+
+    let mapping = ProguardMapping::new(SYNTHETIC_LAMBDA_METHOD_MAPPING.as_bytes());
+    let mut buf = Vec::new();
+    ProguardCache::write(&mapping, &mut buf).unwrap();
+    let cache = ProguardCache::parse(&buf).unwrap();
+    cache.test();
+
+    let actual = cache.remap_stacktrace(input).unwrap();
+    assert_eq!(actual.trim(), expected.trim());
+}
+
+#[test]
+fn test_synthetic_lambda_method_synthesized_flag() {
+    let mapper = ProguardMapper::from(SYNTHETIC_LAMBDA_METHOD_MAPPING);
+
+    // The synthetic lambda class member should have method_synthesized = true.
+    let frame = StackFrame::try_parse("  at a.b.a(Unknown Source)".as_bytes()).unwrap();
+    let remapped: Vec<_> = mapper.remap_frame(&frame).collect();
+    assert!(
+        remapped.iter().all(|f| f.method_synthesized()),
+        "expected all frames from synthetic class to have method_synthesized = true, got: {remapped:?}"
+    );
+
+    // A regular method should have method_synthesized = false.
+    let frame = StackFrame::try_parse("  at a.a.a(a.java:5)".as_bytes()).unwrap();
+    let remapped: Vec<_> = mapper.remap_frame(&frame).collect();
+    assert!(
+        remapped.iter().all(|f| !f.method_synthesized()),
+        "expected regular frame to have method_synthesized = false, got: {remapped:?}"
+    );
+}
+
+#[test]
+fn test_synthetic_lambda_method_synthesized_flag_cache() {
+    let mapping = ProguardMapping::new(SYNTHETIC_LAMBDA_METHOD_MAPPING.as_bytes());
+    let mut buf = Vec::new();
+    ProguardCache::write(&mapping, &mut buf).unwrap();
+    let cache = ProguardCache::parse(&buf).unwrap();
+
+    // The synthetic lambda class member should have method_synthesized = true.
+    let frame = StackFrame::try_parse("  at a.b.a(Unknown Source)".as_bytes()).unwrap();
+    let remapped: Vec<_> = cache.remap_frame(&frame).collect();
+    assert!(
+        remapped.iter().all(|f| f.method_synthesized()),
+        "cache: expected synthetic frame to have method_synthesized = true, got: {remapped:?}"
+    );
+
+    // A regular method should have method_synthesized = false.
+    let frame = StackFrame::try_parse("  at a.a.a(a.java:5)".as_bytes()).unwrap();
+    let remapped: Vec<_> = cache.remap_frame(&frame).collect();
+    assert!(
+        remapped.iter().all(|f| !f.method_synthesized()),
+        "cache: expected regular frame to have method_synthesized = false, got: {remapped:?}"
+    );
+}
+
+// =============================================================================
+// SyntheticLambdaMethodWithInliningStackTrace
+// =============================================================================
+
+const SYNTHETIC_LAMBDA_METHOD_WITH_INLINING_MAPPING: &str = "\
+# {\"id\":\"com.android.tools.r8.mapping\",\"version\":\"1.0\"}
+example.Main -> example.Main:
+    1:1:void main(java.lang.String[]):123 -> main
+example.Foo -> a.a:
+    3:3:void runIt():218 -> b
+    2:2:void main():223 -> c
+example.Foo$$ExternalSyntheticLambda0 -> a.b:
+    4:4:void example.Foo.lambda$main$0():225 -> a
+    4:4:void run(example.Foo):0 -> a
+      # {\"id\":\"com.android.tools.r8.synthesized\"}
+";
+
+#[test]
+fn test_synthetic_lambda_method_with_inlining_stacktrace() {
+    let input = "\
+Exception in thread \"main\" java.lang.NullPointerException
+  at a.b.a(Unknown Source:4)
+  at a.a.b(a.java:3)
+  at a.a.c(a.java:2)
+  at example.Main.main(Main.java:1)
+";
+
+    // Synthetic frames are kept; the inlined lambda$main$0 is not synthetic,
+    // but the outer run() method is.
+    let expected = "\
+Exception in thread \"main\" java.lang.NullPointerException
+    at example.Foo.lambda$main$0(Foo.java:225)
+    at example.Foo$$ExternalSyntheticLambda0.run(Foo.java:0)
+    at example.Foo.runIt(Foo.java:218)
+    at example.Foo.main(Foo.java:223)
+    at example.Main.main(Main.java:123)
+";
+
+    let mapper = ProguardMapper::from(SYNTHETIC_LAMBDA_METHOD_WITH_INLINING_MAPPING);
+    let actual = mapper.remap_stacktrace(input).unwrap();
+    assert_eq!(actual.trim(), expected.trim());
+
+    let mapping = ProguardMapping::new(SYNTHETIC_LAMBDA_METHOD_WITH_INLINING_MAPPING.as_bytes());
+    let mut buf = Vec::new();
+    ProguardCache::write(&mapping, &mut buf).unwrap();
+    let cache = ProguardCache::parse(&buf).unwrap();
+    cache.test();
+
+    let actual = cache.remap_stacktrace(input).unwrap();
+    assert_eq!(actual.trim(), expected.trim());
+}
+
+#[test]
+fn test_synthetic_lambda_method_with_inlining_synthesized_flag() {
+    let mapper = ProguardMapper::from(SYNTHETIC_LAMBDA_METHOD_WITH_INLINING_MAPPING);
+
+    // Inline expansion from a synthetic class: the run() member is synthesized
+    // but the inlined lambda$main$0 is from example.Foo (not synthesized).
+    let frame = StackFrame::try_parse("  at a.b.a(Unknown Source:4)".as_bytes()).unwrap();
+    let remapped: Vec<_> = mapper.remap_frame(&frame).collect();
+    assert_eq!(remapped.len(), 2);
+    // lambda$main$0 is from example.Foo — not synthesized
+    assert!(
+        !remapped[0].method_synthesized(),
+        "inlined frame should not be synthesized"
+    );
+    // run() is from the synthetic class — synthesized
+    assert!(
+        remapped[1].method_synthesized(),
+        "outer synthetic frame should be synthesized"
+    );
+}
+
+// =============================================================================
+// MovedSynthetizedInfoStackTraceTest
+// =============================================================================
+
+const MOVED_SYNTHETIZED_INFO_MAPPING: &str = "\
+# {\"id\":\"com.android.tools.r8.mapping\",\"version\":\"2.2\"}
+com.android.tools.r8.BaseCommand$Builder -> foo.bar:
+    1:1:void inlinee(java.util.Collection):0:0 -> inlinee$synthetic
+    1:1:void inlinee$synthetic(java.util.Collection):0:0 -> inlinee$synthetic
+    2:2:void inlinee(java.util.Collection):206:206 -> inlinee$synthetic
+    2:2:void inlinee$synthetic(java.util.Collection):0:0 -> inlinee$synthetic
+      # {\"id\":\"com.android.tools.r8.synthesized\"}
+    4:4:void inlinee(java.util.Collection):208:208 -> inlinee$synthetic
+    4:4:void inlinee$synthetic(java.util.Collection):0 -> inlinee$synthetic
+    7:7:void error(origin.Origin,java.lang.Throwable):363:363 -> inlinee$synthetic
+    7:7:void inlinee(java.util.Collection):210 -> inlinee$synthetic
+    7:7:void inlinee$synthetic(java.util.Collection):0:0 -> inlinee$synthetic
+";
+
+#[test]
+fn test_moved_synthetized_info_stacktrace() {
+    let input = "\
+java.lang.RuntimeException: foobar
+\tat foo.bar.inlinee$synthetic(BaseCommand.java:2)
+";
+
+    // The inlined pair at line 2: inlinee (original:206) + inlinee$synthetic (original:0).
+    // The inlinee$synthetic method is marked synthesized; inlinee is not.
+    let expected = "\
+java.lang.RuntimeException: foobar
+    at com.android.tools.r8.BaseCommand$Builder.inlinee(BaseCommand.java:206)
+    at com.android.tools.r8.BaseCommand$Builder.inlinee$synthetic(BaseCommand.java:0)
+";
+
+    let mapper = ProguardMapper::from(MOVED_SYNTHETIZED_INFO_MAPPING);
+    let actual = mapper.remap_stacktrace(input).unwrap();
+    assert_eq!(actual.trim(), expected.trim());
+
+    let mapping = ProguardMapping::new(MOVED_SYNTHETIZED_INFO_MAPPING.as_bytes());
+    let mut buf = Vec::new();
+    ProguardCache::write(&mapping, &mut buf).unwrap();
+    let cache = ProguardCache::parse(&buf).unwrap();
+    cache.test();
+
+    let actual = cache.remap_stacktrace(input).unwrap();
+    assert_eq!(actual.trim(), expected.trim());
+}
+
+#[test]
+fn test_moved_synthetized_info_synthesized_flag() {
+    let mapper = ProguardMapper::from(MOVED_SYNTHETIZED_INFO_MAPPING);
+
+    let frame =
+        StackFrame::try_parse("\tat foo.bar.inlinee$synthetic(BaseCommand.java:2)".as_bytes())
+            .unwrap();
+    let remapped: Vec<_> = mapper.remap_frame(&frame).collect();
+    assert_eq!(remapped.len(), 2);
+    // inlinee — not synthesized
+    assert!(
+        !remapped[0].method_synthesized(),
+        "inlinee should not be synthesized"
+    );
+    // inlinee$synthetic — synthesized
+    assert!(
+        remapped[1].method_synthesized(),
+        "inlinee$synthetic should be synthesized"
+    );
+}