[cfe-commits] r151359 - /cfe/trunk/lib/AST/Expr.cpp

[Richard Smith]

On Fri, Feb 24, 2012 at 1:07 AM, Nick Lewycky <nicholas at mxc.ca> wrote:

> Author: nicholas
> Date: Fri Feb 24 03:07:53 2012
> New Revision: 151359
>
> URL: http://llvm.org/viewvc/llvm-project?rev=151359&view=rev
> Log:
> Revert r151357. That unreachable is reachable...
>
> Modified:
>    cfe/trunk/lib/AST/Expr.cpp
>
> Modified: cfe/trunk/lib/AST/Expr.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Expr.cpp?rev=151359&r1=151358&r2=151359&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/AST/Expr.cpp (original)
> +++ cfe/trunk/lib/AST/Expr.cpp Fri Feb 24 03:07:53 2012
> @@ -499,28 +499,25 @@
>   return V.convertToDouble();
>  }
>
> -int StringLiteral::mapCharByteWidth(TargetInfo const &Target,
> -                                    StringKind Kind) {
> +int StringLiteral::mapCharByteWidth(TargetInfo const &target,StringKind
> k) {
>   int CharByteWidth;
> -  switch(Kind) {
> +  switch(k) {
>     case Ascii:
>     case UTF8:
> -      CharByteWidth = Target.getCharWidth();
> +      CharByteWidth = target.getCharWidth();
>       break;
>     case Wide:
> -      CharByteWidth = Target.getWCharWidth();
> +      CharByteWidth = target.getWCharWidth();
>       break;
>     case UTF16:
> -      CharByteWidth = Target.getChar16Width();
> +      CharByteWidth = target.getChar16Width();
>       break;
>     case UTF32:
> -      CharByteWidth = Target.getChar32Width();
> -    default:
> -      llvm_unreachable("Don't know byte width of this string kind!");
> +      CharByteWidth = target.getChar32Width();
>

This is why we need a warning on switch case fallthrough :-)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20120224/4a3a3f03/attachment.html>