[cfe-commits] r137080 - in /cfe/trunk: lib/Sema/SemaDeclCXX.cpp test/CodeGenCXX/copy-assign-volatile-synthesis.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Aug  8 19:26:11 2011
New Revision: 137080

URL: http://llvm.org/viewvc/llvm-project?rev=137080&view=rev
Log:
Don't emit memcpy for copying fields of arrays of volatile elements.
Use the the path that generates a loop. This fixes
bogus error that clang puts out. // rdar://9894548


Added:
    cfe/trunk/test/CodeGenCXX/copy-assign-volatile-synthesis.cpp
Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=137080&r1=137079&r2=137080&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Mon Aug  8 19:26:11 2011
@@ -6933,8 +6933,8 @@
     // explicit assignments, do so. This optimization only applies for arrays 
     // of scalars and arrays of class type with trivial copy-assignment 
     // operators.
-    if (FieldType->isArrayType() && 
-        BaseType.hasTrivialCopyAssignment(Context)) {
+    if (FieldType->isArrayType() && !FieldType.isVolatileQualified()
+        && BaseType.hasTrivialCopyAssignment(Context)) {
       // Compute the size of the memory buffer to be copied.
       QualType SizeType = Context.getSizeType();
       llvm::APInt Size(Context.getTypeSize(SizeType), 

Added: cfe/trunk/test/CodeGenCXX/copy-assign-volatile-synthesis.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/copy-assign-volatile-synthesis.cpp?rev=137080&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/copy-assign-volatile-synthesis.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/copy-assign-volatile-synthesis.cpp Mon Aug  8 19:26:11 2011
@@ -0,0 +1,43 @@
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
+// rdar://9894548
+
+typedef unsigned long word_t;
+typedef unsigned long u64_t;
+typedef unsigned int u32_t;
+
+class ioapic_redir_t {
+public:
+ union {
+  struct {
+   word_t vector : 8;
+
+   word_t delivery_mode : 3;
+   word_t dest_mode : 1;
+
+   word_t delivery_status : 1;
+   word_t polarity : 1;
+   word_t irr : 1;
+   word_t trigger_mode : 1;
+
+   word_t mask : 1;
+   word_t _pad0 : 15;
+
+   word_t dest : 8;
+  };
+  volatile u32_t raw[2];
+  volatile u64_t raw64;
+ };
+};
+
+struct ioapic_shadow_struct
+{
+ ioapic_redir_t redirs[24];
+} ioapic_shadow[16];
+
+void init_ioapic(unsigned long ioapic_id)
+{
+     ioapic_redir_t entry;
+     ioapic_shadow[ioapic_id].redirs[3] = entry;
+}
+
+// CHECK: call void @llvm.memcpy