Don't consider all methods of synthesized classes synthesized

Author: loewenheim

src/cache/mod.rs

@@ -251,7 +251,7 @@ impl<'data> ProguardCache<'data> {
             }) else {
                 return RemappedFrameIter::empty();
             };
-            RemappedFrameIter::members(self, frame, members.iter(), class.is_synthesized())
+            RemappedFrameIter::members(self, frame, members.iter())
         } else {
             let Some(members) = self.get_class_members(class) else {
                 return RemappedFrameIter::empty();
@@ -269,7 +269,7 @@ impl<'data> ProguardCache<'data> {
                 return RemappedFrameIter::empty();
             };
 
-            RemappedFrameIter::members(self, frame, members.iter(), class.is_synthesized())
+            RemappedFrameIter::members(self, frame, members.iter())
         }
     }
 
@@ -418,26 +418,20 @@ pub struct RemappedFrameIter<'r, 'data> {
         StackFrame<'data>,
         std::slice::Iter<'data, raw::Member>,
     )>,
-    synthesized_class: bool,
 }
 
 impl<'data> RemappedFrameIter<'_, 'data> {
     fn empty() -> Self {
-        Self {
-            inner: None,
-            synthesized_class: false,
-        }
+        Self { inner: None }
     }
 
     fn members(
         cache: &'data ProguardCache<'data>,
         frame: StackFrame<'data>,
         members: std::slice::Iter<'data, raw::Member>,
-        synthesized_class: bool,
     ) -> Self {
         Self {
             inner: Some((cache, frame, members)),
-            synthesized_class,
         }
     }
 }
@@ -448,9 +442,9 @@ impl<'data> Iterator for RemappedFrameIter<'_, 'data> {
     fn next(&mut self) -> Option<Self::Item> {
         let (cache, frame, members) = self.inner.as_mut()?;
         if frame.parameters.is_none() {
-            iterate_with_lines(cache, frame, members, self.synthesized_class)
+            iterate_with_lines(cache, frame, members)
         } else {
-            iterate_without_lines(cache, frame, members, self.synthesized_class)
+            iterate_without_lines(cache, frame, members)
         }
     }
 }
@@ -459,7 +453,6 @@ fn iterate_with_lines<'a>(
     cache: &ProguardCache<'a>,
     frame: &mut StackFrame<'a>,
     members: &mut std::slice::Iter<'_, raw::Member>,
-    synthesized_class: bool,
 ) -> Option<StackFrame<'a>> {
     for member in members {
         // skip any members which do not match our frames line
@@ -510,7 +503,7 @@ fn iterate_with_lines<'a>(
             file,
             line,
             parameters: frame.parameters,
-            is_synthesized: member.is_synthesized() || synthesized_class,
+            is_synthesized: member.is_synthesized(),
         });
     }
     None
@@ -520,7 +513,6 @@ fn iterate_without_lines<'a>(
     cache: &ProguardCache<'a>,
     frame: &mut StackFrame<'a>,
     members: &mut std::slice::Iter<'_, raw::Member>,
-    synthesized_class: bool,
 ) -> Option<StackFrame<'a>> {
     let member = members.next()?;
 
@@ -536,7 +528,7 @@ fn iterate_without_lines<'a>(
         file: None,
         line: 0,
         parameters: frame.parameters,
-        is_synthesized: member.is_synthesized() || synthesized_class,
+        is_synthesized: member.is_synthesized(),
     })
 }
 

src/cache/raw.rs

@@ -59,6 +59,9 @@ pub(crate) struct Class {
     /// Whether this class was synthesized by the compiler.
     ///
     /// `0` means `false`, all other values mean `true`.
+    ///
+    /// Note: It's currently unknown what effect a synthesized
+    /// class has.
     pub(crate) is_synthesized: u8,
 
     /// Reserved space.

src/mapper.rs

@@ -77,6 +77,7 @@ struct ClassMapping<'s> {
     obfuscated: &'s str,
     file_name: Option<&'s str>,
     members: HashMap<&'s str, ClassMembers<'s>>,
+    // Note: It's currently unknown what effect a synthesized class has.
     is_synthesized: bool,
 }
 
@@ -86,20 +87,15 @@ type MemberIter<'m> = std::slice::Iter<'m, MemberMapping<'m>>;
 #[derive(Clone, Debug, Default)]
 pub struct RemappedFrameIter<'m> {
     inner: Option<(StackFrame<'m>, MemberIter<'m>)>,
-    synthesized_class: bool,
 }
 
 impl<'m> RemappedFrameIter<'m> {
     fn empty() -> Self {
-        Self {
-            inner: None,
-            synthesized_class: false,
-        }
+        Self { inner: None }
     }
-    fn members(frame: StackFrame<'m>, members: MemberIter<'m>, synthesized_class: bool) -> Self {
+    fn members(frame: StackFrame<'m>, members: MemberIter<'m>) -> Self {
         Self {
             inner: Some((frame, members)),
-            synthesized_class,
         }
     }
 }
@@ -109,9 +105,9 @@ impl<'m> Iterator for RemappedFrameIter<'m> {
     fn next(&mut self) -> Option<Self::Item> {
         let (frame, ref mut members) = self.inner.as_mut()?;
         if frame.parameters.is_none() {
-            iterate_with_lines(frame, members, self.synthesized_class)
+            iterate_with_lines(frame, members)
         } else {
-            iterate_without_lines(frame, members, self.synthesized_class)
+            iterate_without_lines(frame, members)
         }
     }
 }
@@ -125,7 +121,6 @@ fn extract_class_name(full_path: &str) -> Option<&str> {
 fn iterate_with_lines<'a>(
     frame: &mut StackFrame<'a>,
     members: &mut core::slice::Iter<'_, MemberMapping<'a>>,
-    synthesized_class: bool,
 ) -> Option<StackFrame<'a>> {
     for member in members {
         // skip any members which do not match our frames line
@@ -168,7 +163,7 @@ fn iterate_with_lines<'a>(
             file,
             line,
             parameters: frame.parameters,
-            is_synthesized: member.is_synthesized || synthesized_class,
+            is_synthesized: member.is_synthesized,
         });
     }
     None
@@ -177,7 +172,6 @@ fn iterate_with_lines<'a>(
 fn iterate_without_lines<'a>(
     frame: &mut StackFrame<'a>,
     members: &mut core::slice::Iter<'_, MemberMapping<'a>>,
-    synthesized_class: bool,
 ) -> Option<StackFrame<'a>> {
     let member = members.next()?;
 
@@ -191,7 +185,7 @@ fn iterate_without_lines<'a>(
         file: None,
         line: 0,
         parameters: frame.parameters,
-        is_synthesized: member.is_synthesized || synthesized_class,
+        is_synthesized: member.is_synthesized,
     })
 }
 
@@ -447,7 +441,7 @@ impl<'s> ProguardMapper<'s> {
             members.all_mappings.iter()
         };
 
-        RemappedFrameIter::members(frame, mappings, class.is_synthesized)
+        RemappedFrameIter::members(frame, mappings)
     }
 
     /// Remaps a throwable which is the first line of a full stacktrace.

tests/callback.rs

@@ -16,7 +16,6 @@ fn test_method_matches_callback_mapper() {
         28,
     ));
 
-    // The remapped frames should all be synthesized because the class is.
     assert_eq!(
         mapped.next().unwrap(),
         StackFrame::with_file(
@@ -25,7 +24,6 @@ fn test_method_matches_callback_mapper() {
             37,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -58,7 +56,6 @@ fn test_method_matches_callback_cache() {
         28,
     ));
 
-    // The remapped frames should all be synthesized because the class is.
     assert_eq!(
         mapped.next().unwrap(),
         StackFrame::with_file(
@@ -67,7 +64,6 @@ fn test_method_matches_callback_cache() {
             37,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -95,7 +91,6 @@ fn test_method_matches_callback_extra_class_mapper() {
         28,
     ));
 
-    // The remapped frames should all be synthesized because the class is.
     assert_eq!(
         mapped.next().unwrap(),
         StackFrame::with_file(
@@ -104,7 +99,6 @@ fn test_method_matches_callback_extra_class_mapper() {
             10,
             "TestSourceContext",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -114,7 +108,6 @@ fn test_method_matches_callback_extra_class_mapper() {
             6,
             "TestSourceContext",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -124,7 +117,6 @@ fn test_method_matches_callback_extra_class_mapper() {
             38,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -158,7 +150,6 @@ fn test_method_matches_callback_extra_class_cache() {
         28,
     ));
 
-    // The remapped frames should all be synthesized because the class is.
     assert_eq!(
         mapped.next().unwrap(),
         StackFrame::with_file(
@@ -167,7 +158,6 @@ fn test_method_matches_callback_extra_class_cache() {
             10,
             "TestSourceContext",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -177,7 +167,6 @@ fn test_method_matches_callback_extra_class_cache() {
             6,
             "TestSourceContext",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -187,7 +176,6 @@ fn test_method_matches_callback_extra_class_cache() {
             38,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -214,7 +202,6 @@ fn test_method_matches_callback_inner_class_mapper() {
         28,
     ));
 
-    // The remapped frames should all be synthesized because the class is.
     assert_eq!(
         mapped.next().unwrap(),
         StackFrame::with_file(
@@ -223,7 +210,6 @@ fn test_method_matches_callback_inner_class_mapper() {
             19,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -233,7 +219,6 @@ fn test_method_matches_callback_inner_class_mapper() {
             45,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -266,7 +251,6 @@ fn test_method_matches_callback_inner_class_cache() {
         28,
     ));
 
-    // The remapped frames should all be synthesized because the class is.
     assert_eq!(
         mapped.next().unwrap(),
         StackFrame::with_file(
@@ -275,7 +259,6 @@ fn test_method_matches_callback_inner_class_cache() {
             19,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),
@@ -285,7 +268,6 @@ fn test_method_matches_callback_inner_class_cache() {
             45,
             "EditActivity",
         )
-        .with_synthesized(true)
     );
     assert_eq!(
         mapped.next().unwrap(),