git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 86940d87026432683fb6741cd8a34d3b9b18e40d Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Fri, 27 Nov 2020 10:11:08 +0000
   4 Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well
   5
   6 Otherwise, there are instances which are identical in
   7 every other field and therefore sort non-reproducibly
   8 (which breaks binary and source reproducibiliy).
   9
  10 Upstream-Status: Submitted [https://reviews.llvm.org/D97477]
  11 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  12 ---
  13  llvm/utils/TableGen/AsmMatcherEmitter.cpp | 5 ++++-
  14  1 file changed, 4 insertions(+), 1 deletion(-)
  15
  16 diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
  17 index ccf0959389b..1f801e83b7d 100644
  18 --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
  19 +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
  20 @@ -359,7 +359,10 @@ public:
  21      // name of a class shouldn't be significant. However, some of the backends
  22      // accidentally rely on this behaviour, so it will have to stay like this
  23      // until they are fixed.
  24 -    return ValueName < RHS.ValueName;
  25 +    if (ValueName != RHS.ValueName)
  26 +        return ValueName < RHS.ValueName;
  27 +    // All else being equal, we should sort by name, for source and binary reproducibility
  28 +    return Name < RHS.Name;
  29    }
  30  };
  31