Revert previous changes and make sure the llvm::SmallString is not empty