[PATCH] D70671: [clang][CodeGen] Fix wrong memcpy size of no_unique_address in FieldMemcpyizer

2019-11-25 Thread Fangrui Song via Phabricator via cfe-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rG01d8e09fdba0: [clang][CodeGen] Fix wrong memcpy size of 
no_unique_address in FieldMemcpyizer (authored by zsrkmyn, committed by 
MaskRay).

Changed prior to commit:
  https://reviews.llvm.org/D70671?vs=230991=230994#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D70671/new/

https://reviews.llvm.org/D70671

Files:
  clang/lib/CodeGen/CGClass.cpp
  clang/test/CodeGenCXX/no-unique-address-2.cpp


Index: clang/test/CodeGenCXX/no-unique-address-2.cpp
===
--- /dev/null
+++ clang/test/CodeGenCXX/no-unique-address-2.cpp
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -std=c++2a %s -emit-llvm -o - -triple x86_64-linux-gnu | 
FileCheck %s
+
+struct TriviallyCopyable {};
+
+struct NonTriviallyCopyable {
+  NonTriviallyCopyable() = default;
+  NonTriviallyCopyable(const NonTriviallyCopyable&) = default;
+  NonTriviallyCopyable(NonTriviallyCopyable &&) {}
+};
+
+struct Foo {
+  int i;
+  [[no_unique_address]] TriviallyCopyable m;
+  [[no_unique_address]] NonTriviallyCopyable n;
+};
+
+void call() {
+  Foo foo;
+  Foo foo2(static_cast(foo));
+}
+
+// The memcpy call should copy exact 4 bytes for member 'int i'
+// CHECK: define {{.*}} void @_ZN3FooC2EOS_
+// CHECK:  call void @llvm.memcpy.p0i8.p0i8.i64(i8* {{.+}}, i8* {{.+}}, i64 4, 
i1 false)
+// CHECK:  call void @_ZN20NonTriviallyCopyableC2EOS_
Index: clang/lib/CodeGen/CGClass.cpp
===
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -914,6 +914,8 @@
 }
 
 void addMemcpyableField(FieldDecl *F) {
+  if (F->isZeroSize(CGF.getContext()))
+return;
   if (!FirstField)
 addInitialField(F);
   else


Index: clang/test/CodeGenCXX/no-unique-address-2.cpp
===
--- /dev/null
+++ clang/test/CodeGenCXX/no-unique-address-2.cpp
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -std=c++2a %s -emit-llvm -o - -triple x86_64-linux-gnu | FileCheck %s
+
+struct TriviallyCopyable {};
+
+struct NonTriviallyCopyable {
+  NonTriviallyCopyable() = default;
+  NonTriviallyCopyable(const NonTriviallyCopyable&) = default;
+  NonTriviallyCopyable(NonTriviallyCopyable &&) {}
+};
+
+struct Foo {
+  int i;
+  [[no_unique_address]] TriviallyCopyable m;
+  [[no_unique_address]] NonTriviallyCopyable n;
+};
+
+void call() {
+  Foo foo;
+  Foo foo2(static_cast(foo));
+}
+
+// The memcpy call should copy exact 4 bytes for member 'int i'
+// CHECK: define {{.*}} void @_ZN3FooC2EOS_
+// CHECK:  call void @llvm.memcpy.p0i8.p0i8.i64(i8* {{.+}}, i8* {{.+}}, i64 4, i1 false)
+// CHECK:  call void @_ZN20NonTriviallyCopyableC2EOS_
Index: clang/lib/CodeGen/CGClass.cpp
===
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -914,6 +914,8 @@
 }
 
 void addMemcpyableField(FieldDecl *F) {
+  if (F->isZeroSize(CGF.getContext()))
+return;
   if (!FirstField)
 addInitialField(F);
   else
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D70671: [clang][CodeGen] Fix wrong memcpy size of no_unique_address in FieldMemcpyizer

2019-11-25 Thread Senran Zhang via Phabricator via cfe-commits 
zsrkmyn updated this revision to Diff 230991.
zsrkmyn added a comment.

Thanks for reviewing! Would you mind helping me commit this patch? Thanks :-D


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D70671/new/

https://reviews.llvm.org/D70671

Files:
  clang/lib/CodeGen/CGClass.cpp
  clang/test/CodeGenCXX/no-unique-address-2.cpp


Index: clang/test/CodeGenCXX/no-unique-address-2.cpp
===
--- /dev/null
+++ clang/test/CodeGenCXX/no-unique-address-2.cpp
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -std=c++2a %s -emit-llvm -o - -triple x86_64-linux-gnu | 
FileCheck %s
+
+struct TriviallyCopyable {};
+
+struct NonTriviallyCopyable {
+  NonTriviallyCopyable() = default;
+  NonTriviallyCopyable(const NonTriviallyCopyable&) = default;
+  NonTriviallyCopyable(NonTriviallyCopyable &&) {}
+};
+
+struct Foo {
+  int i;
+  [[no_unique_address]] TriviallyCopyable m;
+  [[no_unique_address]] NonTriviallyCopyable n;
+};
+
+void call() {
+  Foo foo;
+  Foo foo2(static_cast(foo));
+}
+
+// The memcpy call should copy exact 4 bytes for member 'int i'
+// CHECK: define {{.*}} void @_ZN3FooC2EOS_
+// CHECK:  call void @llvm.memcpy.p0i8.p0i8.i64(i8* {{.+}}, i8* {{.+}}, i64 4, 
i1 false)
+// CHECK:  call void @_ZN20NonTriviallyCopyableC2EOS_
Index: clang/lib/CodeGen/CGClass.cpp
===
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -914,6 +914,8 @@
 }
 
 void addMemcpyableField(FieldDecl *F) {
+  if (F->isZeroSize(CGF.getContext()))
+return;
   if (!FirstField)
 addInitialField(F);
   else


Index: clang/test/CodeGenCXX/no-unique-address-2.cpp
===
--- /dev/null
+++ clang/test/CodeGenCXX/no-unique-address-2.cpp
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -std=c++2a %s -emit-llvm -o - -triple x86_64-linux-gnu | FileCheck %s
+
+struct TriviallyCopyable {};
+
+struct NonTriviallyCopyable {
+  NonTriviallyCopyable() = default;
+  NonTriviallyCopyable(const NonTriviallyCopyable&) = default;
+  NonTriviallyCopyable(NonTriviallyCopyable &&) {}
+};
+
+struct Foo {
+  int i;
+  [[no_unique_address]] TriviallyCopyable m;
+  [[no_unique_address]] NonTriviallyCopyable n;
+};
+
+void call() {
+  Foo foo;
+  Foo foo2(static_cast(foo));
+}
+
+// The memcpy call should copy exact 4 bytes for member 'int i'
+// CHECK: define {{.*}} void @_ZN3FooC2EOS_
+// CHECK:  call void @llvm.memcpy.p0i8.p0i8.i64(i8* {{.+}}, i8* {{.+}}, i64 4, i1 false)
+// CHECK:  call void @_ZN20NonTriviallyCopyableC2EOS_
Index: clang/lib/CodeGen/CGClass.cpp
===
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -914,6 +914,8 @@
 }
 
 void addMemcpyableField(FieldDecl *F) {
+  if (F->isZeroSize(CGF.getContext()))
+return;
   if (!FirstField)
 addInitialField(F);
   else
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D70671: [clang][CodeGen] Fix wrong memcpy size of no_unique_address in FieldMemcpyizer

2019-11-25 Thread Fangrui Song via Phabricator via cfe-commits 
MaskRay accepted this revision.
MaskRay added inline comments.



Comment at: clang/test/CodeGenCXX/no-unique-address-2.cpp:17
+
+void call()
+{

`{` on the same line of `call()`


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D70671/new/

https://reviews.llvm.org/D70671



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D70671: [clang][CodeGen] Fix wrong memcpy size of no_unique_address in FieldMemcpyizer

2019-11-25 Thread John McCall via Phabricator via cfe-commits 
rjmccall accepted this revision.
rjmccall added a comment.
This revision is now accepted and ready to land.

LGTM


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D70671/new/

https://reviews.llvm.org/D70671



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D70671: [clang][CodeGen] Fix wrong memcpy size of no_unique_address in FieldMemcpyizer

2019-11-25 Thread Senran Zhang via Phabricator via cfe-commits 
zsrkmyn created this revision.
zsrkmyn added reviewers: erichkeane, aaron.ballman, MaskRay, rjmccall.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

When generating ctor, FieldMemcpyizer wrongly treated zero-sized class members
as what should be copied, and generated wrong memcpy size under some special
circumstances. This patch tries to fix it.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D70671

Files:
  clang/lib/CodeGen/CGClass.cpp
  clang/test/CodeGenCXX/no-unique-address-2.cpp


Index: clang/test/CodeGenCXX/no-unique-address-2.cpp
===
--- /dev/null
+++ clang/test/CodeGenCXX/no-unique-address-2.cpp
@@ -0,0 +1,26 @@
+// RUN: %clang_cc1 -std=c++2a %s -emit-llvm -o - -triple x86_64-linux-gnu | 
FileCheck %s
+
+struct TriviallyCopyable {};
+
+struct NonTriviallyCopyable {
+  NonTriviallyCopyable() = default;
+  NonTriviallyCopyable(const NonTriviallyCopyable&) = default;
+  NonTriviallyCopyable(NonTriviallyCopyable &&) {}
+};
+
+struct Foo {
+  int i;
+  [[no_unique_address]] TriviallyCopyable m;
+  [[no_unique_address]] NonTriviallyCopyable n;
+};
+
+void call()
+{
+  Foo foo;
+  Foo foo2(static_cast(foo));
+}
+
+// The memcpy call should copy exact 4 bytes for member 'int i'
+// CHECK: define {{.*}} void @_ZN3FooC2EOS_
+// CHECK:  call void @llvm.memcpy.p0i8.p0i8.i64(i8* {{.+}}, i8* {{.+}}, i64 4, 
i1 false)
+// CHECK:  call void @_ZN20NonTriviallyCopyableC2EOS_
Index: clang/lib/CodeGen/CGClass.cpp
===
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -914,6 +914,8 @@
 }
 
 void addMemcpyableField(FieldDecl *F) {
+  if (F->isZeroSize(CGF.getContext()))
+return;
   if (!FirstField)
 addInitialField(F);
   else


Index: clang/test/CodeGenCXX/no-unique-address-2.cpp
===
--- /dev/null
+++ clang/test/CodeGenCXX/no-unique-address-2.cpp
@@ -0,0 +1,26 @@
+// RUN: %clang_cc1 -std=c++2a %s -emit-llvm -o - -triple x86_64-linux-gnu | FileCheck %s
+
+struct TriviallyCopyable {};
+
+struct NonTriviallyCopyable {
+  NonTriviallyCopyable() = default;
+  NonTriviallyCopyable(const NonTriviallyCopyable&) = default;
+  NonTriviallyCopyable(NonTriviallyCopyable &&) {}
+};
+
+struct Foo {
+  int i;
+  [[no_unique_address]] TriviallyCopyable m;
+  [[no_unique_address]] NonTriviallyCopyable n;
+};
+
+void call()
+{
+  Foo foo;
+  Foo foo2(static_cast(foo));
+}
+
+// The memcpy call should copy exact 4 bytes for member 'int i'
+// CHECK: define {{.*}} void @_ZN3FooC2EOS_
+// CHECK:  call void @llvm.memcpy.p0i8.p0i8.i64(i8* {{.+}}, i8* {{.+}}, i64 4, i1 false)
+// CHECK:  call void @_ZN20NonTriviallyCopyableC2EOS_
Index: clang/lib/CodeGen/CGClass.cpp
===
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -914,6 +914,8 @@
 }
 
 void addMemcpyableField(FieldDecl *F) {
+  if (F->isZeroSize(CGF.getContext()))
+return;
   if (!FirstField)
 addInitialField(F);
   else
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits