r338321 - Fix use of uninitialized variable in r338299

[Eric Christopher via cfe-commits]

I'm probably missing something, from looking here:

  FieldOffset = 0;
  if (CGM.getLangOpts().OpenCL) {
    FType = CGM.getContext().IntTy;
    EltTys.push_back(CreateMemberType(Unit, FType, "__size", &FieldOffset));
    EltTys.push_back(CreateMemberType(Unit, FType, "__align",
&FieldOffset));
  } else {
    FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
    EltTys.push_back(CreateMemberType(Unit, FType, "__isa", &FieldOffset));
    FType = CGM.getContext().IntTy;
    EltTys.push_back(CreateMemberType(Unit, FType, "__flags",
&FieldOffset));
    EltTys.push_back(CreateMemberType(Unit, FType, "__reserved",
&FieldOffset));
    FType = CGM.getContext().getPointerType(Ty->getPointeeType());
    EltTys.push_back(CreateMemberType(Unit, FType, "__FuncPtr",
&FieldOffset));
    FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
    FieldSize = CGM.getContext().getTypeSize(Ty);
    FieldAlign = CGM.getContext().getTypeAlign(Ty);
    EltTys.push_back(DBuilder.createMemberType(
        Unit, "__descriptor", nullptr, LineNo, FieldSize, FieldAlign,
FieldOffset,
        llvm::DINode::FlagZero, DescTy));
    FieldOffset += FieldSize;
  }

FieldOffset is only advanced for non opencl blocks. And then just used in
the type.

I'll be honest none of that makes any particular sense, but in particular
these two definitely don't match for the type.

Thoughts? At any rate if you could document what the intended code is here
I'd appreciate it.

-eric

On Tue, Jul 31, 2018 at 9:18 AM <scott at scottlinder.com> wrote:

> I think this version is right; the FieldOffset for OpenCL here will be 2
> * getTypeSize(IntTy). The final `FieldOffset += FieldSize` that was
> moved only applies to the non-OpenCL "__descriptor" field.
>
> Scott
>
> On 2018-07-30 19:22, Eric Christopher wrote:
> > Is 0 right for FieldOffset for OpenCL here? Seems a little odd.
> >
> > -eric
> >
> > On Mon, Jul 30, 2018 at 3:56 PM Scott Linder via cfe-commits
> > <cfe-commits at lists.llvm.org> wrote:
> >
> >> Author: scott.linder
> >> Date: Mon Jul 30 15:52:07 2018
> >> New Revision: 338321
> >>
> >> URL: http://llvm.org/viewvc/llvm-project?rev=338321&view=rev [1]
> >> Log:
> >> Fix use of uninitialized variable in r338299
> >>
> >> Modified:
> >> cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
> >>
> >> Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
> >> URL:
> >>
> >
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=338321&r1=338320&r2=338321&view=diff
> >> [2]
> >>
> >
> ==============================================================================
> >> --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
> >> +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Mon Jul 30 15:52:07 2018
> >> @@ -989,9 +989,9 @@ llvm::DIType *CGDebugInfo::CreateType(co
> >> EltTys.push_back(DBuilder.createMemberType(
> >> Unit, "__descriptor", nullptr, LineNo, FieldSize,
> >> FieldAlign, FieldOffset,
> >> llvm::DINode::FlagZero, DescTy));
> >> + FieldOffset += FieldSize;
> >> }
> >>
> >> - FieldOffset += FieldSize;
> >> Elements = DBuilder.getOrCreateArray(EltTys);
> >>
> >> // The __block_literal_generic structs are marked with a special
> >>
> >> _______________________________________________
> >> cfe-commits mailing list
> >> cfe-commits at lists.llvm.org
> >> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits [3]
> >
> >
> > Links:
> > ------
> > [1] http://llvm.org/viewvc/llvm-project?rev=338321&view=rev
> > [2]
> >
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=338321&r1=338320&r2=338321&view=diff
> > [3] http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180731/42acff8f/attachment.html>