From 46b7300da56377bc710afaa9cddd5aeae434e76f Mon Sep 17 00:00:00 2001
From: Jago Gyselinck <jago.gyselinck@guardsquare.com>
Date: Thu, 3 Sep 2020 10:25:26 +0000
Subject: [PATCH] Backport DGD-2494

---
 base/src/proguard/obfuscate/MemberNameCollector.java | 5 ++---
 docs/md/releasenotes.md                              | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/src/proguard/obfuscate/MemberNameCollector.java b/base/src/proguard/obfuscate/MemberNameCollector.java
index 61d70361..db451807 100644
--- a/base/src/proguard/obfuscate/MemberNameCollector.java
+++ b/base/src/proguard/obfuscate/MemberNameCollector.java
@@ -92,9 +92,8 @@ implements   MemberVisitor
             // Isn't there another original name for this new name, or should
             // this original name get priority?
             String otherName = (String)nameMap.get(newName);
-            if (otherName == null                              ||
-                MemberObfuscator.hasFixedNewMemberName(member) ||
-                name.compareTo(otherName) < 0)
+            if (otherName == null ||
+                MemberObfuscator.hasFixedNewMemberName(member))
             {
                 // Remember not to use the new name again in this name space.
                 nameMap.put(newName, name);
diff --git a/docs/md/releasenotes.md b/docs/md/releasenotes.md
index a1d19ac2..32d33749 100644
--- a/docs/md/releasenotes.md
+++ b/docs/md/releasenotes.md
@@ -2,6 +2,7 @@
 
 | Version| Issue    | Module   | Explanation
 |--------|----------|----------|----------------------------------
+| 7.0.1  | DGD-2494 | CORE     | Fix naming conflict resolution potentially resulting in the renaming of library members.
 | 7.0.1  |          | RETRACE  | Extend expressions supported by Retrace.
 | 7.0.0  |          | CORE     | Added support for [Kotlin metadata](manual/kotlin.md), with new option `-keepkotlinmetadata`.
 | 7.0.0  | PGD-32   | CORE     | Allowing Java 14 class files.