[PATCH] D88470: [clangd] Extract options struct for ClangdLSPServer. NFC

[Sam McCall via cfe-commits]

Yes, sorry about that. It has been fixed
in 6342b38c5fee74df94d7b0c34e5a93b9b22763df.

On Wed, Sep 30, 2020 at 11:12 AM Rainer Orth via Phabricator <
reviews at reviews.llvm.org> wrote:

> ro added a comment.
>
> This patch broke builds with `gcc`, e.g. Builder clang-solaris11-amd64
> Build #6724 <
> http://lab.llvm.org:8014/builders/clang-solaris11-amd64/builds/6724>:
>
>   [23/122] Building CXX object
> tools/clang/tools/extra/clangd/tool/CMakeFiles/clangd.dir/ClangdMain.cpp.o
>   FAILED:
> tools/clang/tools/extra/clangd/tool/CMakeFiles/clangd.dir/ClangdMain.cpp.o
>   /usr/gcc/9/bin/c++  -DGTEST_HAS_RTTI=0 -D_DEBUG -D_FILE_OFFSET_BITS=64
> -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
> -D__STDC_LIMIT_MACROS -Itools/clang/tools/extra/clangd/tool
> -I/opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool
> -Itools/clang/tools/extra/clangd/../clang-tidy
> -I/opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang/include
> -Itools/clang/include -Iinclude
> -I/opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/llvm/include
> -I/opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/llvm/include/llvm/Support/Solaris
> -I/opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/..
> -Itools/clang/tools/extra/clangd/tool/.. -Itools/clang/tools/extra/clangd
> -fPIC -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra
> -Wno-unused-parameter -Wwrite-strings -Wcast-qual
> -Wno-missing-field-initializers -pedantic -Wno-long-long
> -Wimplicit-fallthrough -Wno-maybe-uninitialized -Wno-class-memaccess
> -Wno-redundant-move -Wno-noexcept-type -Wdelete-non-virtual-dtor
> -Wsuggest-override -Wno-comment -fdiagnostics-color -ffunction-sections
> -fdata-sections -fno-common -Woverloaded-virtual -fno-strict-aliasing -O3
>    -fno-exceptions -fno-rtti -UNDEBUG -std=c++14 -MD -MT
> tools/clang/tools/extra/clangd/tool/CMakeFiles/clangd.dir/ClangdMain.cpp.o
> -MF
> tools/clang/tools/extra/clangd/tool/CMakeFiles/clangd.dir/ClangdMain.cpp.o.d
> -o
> tools/clang/tools/extra/clangd/tool/CMakeFiles/clangd.dir/ClangdMain.cpp.o
> -c
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/ClangdMain.cpp
>   In file included from
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/ClangdMain.cpp:9:
>
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/../ClangdLSPServer.h:47:36:
> error: declaration of ‘llvm::Optional<clang::clangd::OffsetEncoding>
> clang::clangd::ClangdLSPServer::Options::OffsetEncoding’ changes meaning of
> ‘OffsetEncoding’ [-fpermissive]
>      47 |     llvm::Optional<OffsetEncoding> OffsetEncoding;
>         |                                    ^~~~~~~~~~~~~~
>   In file included from
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/../Headers.h:12,
>                    from
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/../CodeComplete.h:19,
>                    from
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/../ClangdServer.h:13,
>                    from
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/../ClangdLSPServer.h:12,
>                    from
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/ClangdMain.cpp:9:
>
> /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/clang-tools-extra/clangd/tool/../Protocol.h:370:12:
> note: ‘OffsetEncoding’ declared here as ‘enum class
> clang::clangd::OffsetEncoding’
>     370 | enum class OffsetEncoding {
>         |            ^~~~~~~~~~~~~~
>
>
> Repository:
>   rG LLVM Github Monorepo
>
> CHANGES SINCE LAST ACTION
>   https://reviews.llvm.org/D88470/new/
>
> https://reviews.llvm.org/D88470
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200930/d57e18e9/attachment-0001.html>