From e024fb1378109eef834e88af026766c826942ec3 Mon Sep 17 00:00:00 2001
From: chrchr-github <christian.riesch@live.com>
Date: Wed, 8 Nov 2023 23:10:35 +0100
Subject: [PATCH] Fix  #12166 debug: varid0 with reference typedef

---
 lib/tokenize.cpp             | 3 ++-
 test/testsimplifytypedef.cpp | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 2d8a5eb9ae8..b6703f7d3c3 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -891,7 +891,8 @@ namespace {
             tok->deleteThis();
 
             // Unsplit variable declarations
-            if (Token::Match(tok4->previous(), "] ; %name% = {") && tok4->isSplittedVarDeclEq()) {
+            if (tok4 && tok4->isSplittedVarDeclEq() &&
+                ((tok4->isCpp() && Token::Match(tok4->tokAt(-2), "& %name% ;")) || Token::Match(tok4->previous(), "] ; %name% = {"))) {
                 tok4->deleteNext();
                 tok4->deleteThis();
             }
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index af51e0171dc..db6891bf9fe 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -210,6 +210,7 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef145); // #9353
         TEST_CASE(simplifyTypedef146);
         TEST_CASE(simplifyTypedef147);
+        TEST_CASE(simplifyTypedef148);
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -3428,6 +3429,13 @@ class TestSimplifyTypedef : public TestFixture {
                       tok(code));
     }
 
+    void simplifyTypedef148() {
+        const char* code{};
+        code = "typedef int& R;\n" // #12166
+               "R r = i;\n";
+        ASSERT_EQUALS("int & r = i ;", tok(code));
+    }
+
     void simplifyTypedefFunction1() {
         {
             const char code[] = "typedef void (*my_func)();\n"