mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-25 01:44:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "iasl: add extra conditionals to identify redeclarations of named objects and/or externals."

Browse Source 
This reverts commit 24a5af09ee3a822b46045a27ee1f43328df3ea9b.
This commit is contained in:
Erik Schmauss 2018-06-04 15:09:21 -07:00
parent 7ec8096697
commit 4d66a04a35
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/compiler/aslload.c
View File

@ -876,9 +876,7 @@ LdNamespace1Begin (
{
/*
* Allow one create on an object or segment that was
* previously declared External only if WalkState->OwnerId and
* Node->OwnerId are different (meaning that the current WalkState
* and the Node are in different tables).
* previously declared External
*/
Node->Flags &= ~ANOBJ_IS_EXTERNAL;
Node->Type = (UINT8) ObjectType;
@ -895,13 +893,6 @@ LdNamespace1Begin (
}
Status = AE_OK;
if (Node->OwnerId == WalkState->OwnerId)
{
AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Op,
Op->Asl.ExternalName, ASL_MSG_EXTERN_FOUND_HERE, Node->Op,
Node->Op->Asl.ExternalName);
}
}
else if (!(Node->Flags & ANOBJ_IS_EXTERNAL) &&
(Op->Asl.ParseOpcode == PARSEOP_EXTERNAL))
@ -909,18 +900,9 @@ LdNamespace1Begin (
/*
* Allow externals in same scope as the definition of the
* actual object. Similar to C. Allows multiple definition
* blocks that refer to each other in the same file. However,
* do not allow name declaration and an external declaration
* within the same table. This is considered a re-declaration.
* blocks that refer to each other in the same file.
*/
Status = AE_OK;
if (Node->OwnerId == WalkState->OwnerId)
{
AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Op,
Op->Asl.ExternalName, ASL_MSG_EXTERN_FOUND_HERE, Node->Op,
Node->Op->Asl.ExternalName);
}
}
else if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
(Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) &&