Merge pull request #3182 from yebblies/issue12051

Issue 12051 - Wrong code with ?: resulting in char on x86-64