From f3bbb1ca6c1b2b877d015a8f5f0c67e48a7a57ae Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 18 Jun 2015 17:27:40 +0000
Subject: Import ACPICA 20150619.

---
 source/compiler/aslfold.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source/compiler/aslfold.c')

diff --git a/source/compiler/aslfold.c b/source/compiler/aslfold.c
index 6baa081359d8..0b3ef8d166a9 100644
--- a/source/compiler/aslfold.c
+++ b/source/compiler/aslfold.c
@@ -236,6 +236,8 @@ OpcAmlCheckForConstant (
      */
     if (WalkState->Opcode == AML_BUFFER_OP)
     {
+        DbgPrint (ASL_PARSE_OUTPUT,
+            "\nBuffer+Buffer->Buffer constant reduction is not supported yet");
         Status = AE_TYPE;
         goto CleanupAndExit;
     }
@@ -496,6 +498,10 @@ TrTransformToStoreOp (
         goto EvalError;
     }
 
+    /* Truncate any subtree expressions, they have been evaluated */
+
+    Child1->Asl.Child = NULL;
+
     /* Folded constant is in ObjDesc, store into Child1 */
 
     TrInstallReducedConstant (Child1, ObjDesc);
@@ -507,11 +513,6 @@ TrTransformToStoreOp (
     UtSetParseOpName (Op);
     Op->Common.Parent = OriginalParent;
 
-    /* Truncate any subtree expressions, they have been evaluated */
-
-    Child1->Asl.Child = NULL;
-    Child2->Asl.Child = NULL;
-
     /* First child is the folded constant */
 
     /* Second child will be the target */
-- 
cgit v1.2.3