[all-commits] [llvm/llvm-project] baa2b8: Fix a git apply that went bad somehow.

[Aaron Ballman via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: baa2b8d08502acfa91a8dfd699d25f7b4e25edbb
      https://github.com/llvm/llvm-project/commit/baa2b8d08502acfa91a8dfd699d25f7b4e25edbb
  Author: Aaron Ballman <aaron at aaronballman.com>
  Date:   2021-06-01 (Tue, 01 Jun 2021)

  Changed paths:
    M clang/lib/Lex/PPDirectives.cpp
    M clang/test/Preprocessor/elifdef.c

  Log Message:
  -----------
  Fix a git apply that went bad somehow.

When applying the changes in 8edd3464afbff65d7d5945b3a8b20009d6ff5deb,
it seems that this bit got merged incorrectly and no test coverage
caught the issue. This fixes the diagnostic and adds a test.