[llvm-branch-commits] [clang-tools-extra-branch] r367807 - Merging r367687:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Aug  5 00:43:25 2019
New Revision: 367807

URL: http://llvm.org/viewvc/llvm-project?rev=367807&view=rev
Log:
Merging r367687:
------------------------------------------------------------------------
r367687 | ibiryukov | 2019-08-02 17:23:04 +0200 (Fri, 02 Aug 2019) | 16 lines

[clangd] Fix a crash when presenting values for Hover

Summary:
We should pass the expression type, not a variable type when printing
the resulting value. Variable type may be different from what the
pretty-printing function expects, e.g. have references.

Reviewers: sammccall

Reviewed By: sammccall

Subscribers: MaskRay, jkorous, arphaman, kadircet, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D65655
------------------------------------------------------------------------

Modified:
    clang-tools-extra/branches/release_90/   (props changed)
    clang-tools-extra/branches/release_90/clangd/XRefs.cpp
    clang-tools-extra/branches/release_90/clangd/unittests/XRefsTests.cpp

Propchange: clang-tools-extra/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  5 00:43:25 2019
@@ -1 +1 @@
-/clang-tools-extra/trunk:366443,366451,366455,366545,366559,366687,366811,366880,366900,366991-366992,367112
+/clang-tools-extra/trunk:366443,366451,366455,366545,366559,366687,366811,366880,366900,366991-366992,367112,367687

Modified: clang-tools-extra/branches/release_90/clangd/XRefs.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_90/clangd/XRefs.cpp?rev=367807&r1=367806&r2=367807&view=diff
==============================================================================
--- clang-tools-extra/branches/release_90/clangd/XRefs.cpp (original)
+++ clang-tools-extra/branches/release_90/clangd/XRefs.cpp Mon Aug  5 00:43:25 2019
@@ -716,7 +716,7 @@ static HoverInfo getHoverContents(const
         HI.Value.emplace();
         llvm::raw_string_ostream ValueOS(*HI.Value);
         Result.Val.printPretty(ValueOS, const_cast<ASTContext &>(Ctx),
-                               Var->getType());
+                               Init->getType());
       }
     }
   }

Modified: clang-tools-extra/branches/release_90/clangd/unittests/XRefsTests.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_90/clangd/unittests/XRefsTests.cpp?rev=367807&r1=367806&r2=367807&view=diff
==============================================================================
--- clang-tools-extra/branches/release_90/clangd/unittests/XRefsTests.cpp (original)
+++ clang-tools-extra/branches/release_90/clangd/unittests/XRefsTests.cpp Mon Aug  5 00:43:25 2019
@@ -1793,6 +1793,16 @@ TEST(Hover, All) {
           "int\n"
           "]",
       },
+      {
+          R"cpp(// Should not crash when evaluating the initializer.
+            struct Test {};
+            void test() { Test && te^st = {}; }
+          )cpp",
+          "text[Declared in]code[test]\n"
+          "codeblock(cpp) [\n"
+          "struct Test &&test = {}\n"
+          "]",
+      },
   };
 
   // Create a tiny index, so tests above can verify documentation is fetched.