Merge pull request #3613 from WalterBright/hpohl-opt

Increase allocation chunk size + minor refactoring

src/declaration.c

@@ -2072,25 +2072,7 @@ Expression *VarDeclaration::getConstInitializer(bool needFullType)
 
 bool VarDeclaration::canTakeAddressOf()
 {
-#if 0
-    /* Global variables and struct/class fields of the form:
-     *  const int x = 3;
-     * are not stored and hence cannot have their address taken.
-     */
-    if ((isConst() || isImmutable()) &&
-        storage_class & STCinit &&
-        (!(storage_class & (STCstatic | STCextern)) || isField()) &&
-        (!parent || toParent()->isModule() || toParent()->isTemplateInstance()) &&
-        type->toBasetype()->isTypeBasic()
-       )
-    {
-        return false;
-    }
-#else
-    if (storage_class & STCmanifest)
-        return false;
-#endif
-    return true;
+    return !(storage_class & STCmanifest);
 }
 
 
@@ -2106,19 +2088,18 @@ bool VarDeclaration::isDataseg()
     printf("%llx, isModule: %p, isTemplateInstance: %p\n", storage_class & (STCstatic | STCconst), parent->isModule(), parent->isTemplateInstance());
     printf("parent = '%s'\n", parent->toChars());
 #endif
-    if (storage_class & STCmanifest)
+    if (!canTakeAddressOf())
         return false;
-    Dsymbol *parent = this->toParent();
+    Dsymbol *parent = toParent();
     if (!parent && !(storage_class & STCstatic))
     {
         error("forward referenced");
         type = Type::terror;
         return false;
     }
-    return canTakeAddressOf() &&
-        (storage_class & (STCstatic | STCextern | STCtls | STCgshared) ||
-         toParent()->isModule() ||
-         toParent()->isTemplateInstance());
+    return (storage_class & (STCstatic | STCextern | STCtls | STCgshared) ||
+           parent->isModule() ||
+           parent->isTemplateInstance());
 }
 
 /************************************

src/root/rmem.c

@@ -129,11 +129,9 @@ void Mem::error()
 /* Allocate, but never release
  */
 
-// Allocate a little less than 64kB because the C runtime adds some overhead that
-// causes the actual memory block to be larger than 64kB otherwise. E.g. the dmc
-// runtime rounds the size up to 128kB, but the remaining space in the chunk is less
-// than 64kB, so it cannot be used by another chunk.
-#define CHUNK_SIZE (4096 * 16 - 64)
+// Allocate a little less than 1Mb because the C runtime adds some overhead that
+// causes the actual memory block to be larger than 1Mb otherwise.
+#define CHUNK_SIZE (256 * 4096 - 64)
 
 static size_t heapleft = 0;
 static void *heapp;