[PATCH] D118428: [clang-cl] Support the /JMC flag

[Paul Kirth via Phabricator via llvm-commits]

paulkirth added a comment.

Hi,

We have two failing test cases on Fuchsia's clang canary builder on Windows x64.

LLVM :: Instrumentation/JustMyCode/jmc-instrument-x86.ll 
LLVM :: Instrumentation/JustMyCode/jmc-instrument.ll

First seen here: https://luci-milo.appspot.com/ui/p/fuchsia/builders/toolchain.ci/clang-windows-x64/b8822587673277278177/overview

These are JustMyCode tests, added in this patch, and it appears these tests may need to be adjusted.

You can find the full output in the linked builders, but here is a sample output from one of the tests. It seems to me like the lit file may just need to be adjusted slightly?

  Script:
  --
  : 'RUN: at line 1';   c:\b\s\w\ir\x\w\staging\llvm_build\bin\opt.exe -jmc-instrument -S < C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\Instrumentation\JustMyCode\jmc-instrument-x86.ll | c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\Instrumentation\JustMyCode\jmc-instrument-x86.ll
  --
  Exit Code: 1
  
  Command Output (stdout):
  --
  $ ":" "RUN: at line 1"
  $ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\opt.exe" "-jmc-instrument" "-S"
  $ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\Instrumentation\JustMyCode\jmc-instrument-x86.ll"
  # command stderr:
  C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\Instrumentation\JustMyCode\jmc-instrument-x86.ll:5:10: error: CHECK: expected string not found in input
  ; CHECK: @"_A85D9D03_x at c" = internal unnamed_addr global i8 1, section ".msvcjmc", align 1, !dbg !0
           ^
  <stdin>:6:34: note: scanning from here
  $_JustMyCode_Default = comdat any
                                   ^
  <stdin>:8:1: note: possible intended match here
  @"_A8764FDD_x at c" = internal unnamed_addr global i8 1, section ".msvcjmc", align 1, !dbg !0
  ^
  
  Input file: <stdin>
  Check file: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\Instrumentation\JustMyCode\jmc-instrument-x86.ll
  
  -dump-input=help explains the following input dump.
  
  Input was:
  <<<<<<
             1: ; ModuleID = '<stdin>' 
             2: source_filename = "<stdin>" 
             3: target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32-a:0:32-S32" 
             4: target triple = "i386-pc-windows-msvc" 
             5:  
             6: $_JustMyCode_Default = comdat any 
  check:5'0                                      X error: no match found
             7:  
  check:5'0     ~
             8: @"_A8764FDD_x at c" = internal unnamed_addr global i8 1, section ".msvcjmc", align 1, !dbg !0 
  check:5'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  check:5'1     ?                                                                                           possible intended match
             9: @llvm.used = appending global [1 x i8*] [i8* bitcast (void (i8*)* @_JustMyCode_Default to i8*)], section "llvm.metadata" 
  check:5'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            10:  
  check:5'0     ~
            11: define void @w1() #0 !dbg !10 { 
  check:5'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            12:  call x86_fastcallcc void @__CheckForDebuggerJustMyCode(i8* inreg noundef @"_A8764FDD_x at c") 
  check:5'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            13:  ret void 
  check:5'0     ~~~~~~~~~~
             .
             .
             .
  >>>>>>
  
  error: command failed with exit status: 1
  
  --

If fixing the test will take a long time, can you revert until one is ready?


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D118428/new/

https://reviews.llvm.org/D118428