am 58fcd13c: Merge "Fix up slang for merge through LLVM r163557." into jb-mr1-dev

* commit '58fcd13c1646ee303f844484935a827b4380b08c':
  Fix up slang for merge through LLVM r163557.