Merge branch 'master' into merge-2.069

ldc-developers · Feb 23, 2016 · 2d82dae · 2d82dae
2 parents 9a0958f + b76204e
commit 2d82dae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/gen/toir.cpp b/gen/toir.cpp
@@ -1194,10 +1194,11 @@ class ToElemVisitor : public Visitor {
       // This is a bit more convoluted than it would need to be, because it
       // has to take templated interface methods into account, for which
       // isFinalFunc is not necessarily true.
-      // Also, private methods are always not virtual.
+      // Also, private/package methods are always non-virtual.
       const bool nonFinal = !fdecl->isFinalFunc() &&
                             (fdecl->isAbstract() || fdecl->isVirtual()) &&
-                            fdecl->prot().kind != PROTprivate;
+                            fdecl->prot().kind != PROTprivate &&
+                            fdecl->prot().kind != PROTpackage;
 
       // Get the actual function value to call.
       LLValue *funcval = nullptr;

diff --git a/tests/d2/dmd-testsuite b/tests/d2/dmd-testsuite
diff --git a/utils/gen_gccbuiltins.cpp b/utils/gen_gccbuiltins.cpp
@@ -111,7 +111,11 @@ void processRecord(raw_ostream& os, Record& rec, string arch)
     replace(name.begin(), name.end(), '_', '.');
     name = string("llvm.") + name;
 
+#if LDC_LLVM_VER >= 309
+    ListInit* propsList = rec.getValueAsListInit("IntrProperties");
+#else
     ListInit* propsList = rec.getValueAsListInit("Properties");
+#endif
     string prop =
 #if LDC_LLVM_VER >= 307
         propsList->size()
@@ -166,7 +170,7 @@ void processRecord(raw_ostream& os, Record& rec, string arch)
     for(size_t i = 1; i < params.size(); i++)
         os << ", " << params[i];
 
-    os << ")" + attributes(rec.getValueAsListInit("Properties")) + ";\n\n";
+    os << ")" + attributes(propsList) + ";\n\n";
 }
 
 std::string arch;
+7 −0		compilable/ldc_github_1308.d
+30 −0		runnable/test22.d