[clang] fixed bugs after Barry's comments
??
??
Merge remote-tracking branch 'upstream/master'